diff --git a/2999bb06-iohelper-libvirtd.patch b/2999bb06-iohelper-libvirtd.patch
new file mode 100644
index 0000000..f7ef3cf
--- /dev/null
+++ b/2999bb06-iohelper-libvirtd.patch
@@ -0,0 +1,33 @@
+commit 2999bb06f3fd448c65eba59a2f20128c9e46bf01
+Author: Wen Congyang <wency@cn.fujitsu.com>
+Date:   Fri Apr 8 11:26:47 2011 +0800
+
+    do not build libvirt_iohelper when building without libvirtd
+    
+    The libexec program libvirt_iohelper is only for libvirtd. If we build rpm
+    without libvirtd, we will receive the following messages:
+    
+    Checking for unpackaged file(s): /usr/lib/rpm/check-files /home/wency/rpmbuild/BUILDROOT/libvirt-0.9.0-1.el6.x86_64
+    error: Installed (but unpackaged) file(s) found:
+       /usr/libexec/libvirt_iohelper
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 3649106..dce866e 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1183,6 +1183,7 @@ EXTRA_DIST += $(LIBVIRT_QEMU_SYMBOL_FILE)
+ 
+ libexec_PROGRAMS =
+ 
++if WITH_LIBVIRTD
+ libexec_PROGRAMS += libvirt_iohelper
+ libvirt_iohelper_SOURCES = $(UTIL_IO_HELPER_SOURCES)
+ libvirt_iohelper_LDFLAGS = $(WARN_LDFLAGS) $(AM_LDFLAGS)
+@@ -1191,6 +1192,7 @@ libvirt_iohelper_LDADD =		\
+ 		../gnulib/lib/libgnu.la
+ 
+ libvirt_iohelper_CFLAGS = $(AM_CFLAGS)
++endif
+ 
+ if WITH_STORAGE_DISK
+ if WITH_LIBVIRTD
diff --git a/libvirt.changes b/libvirt.changes
index 7f6a5fd..5ab8a4a 100644
--- a/libvirt.changes
+++ b/libvirt.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Apr 12 15:26:02 MDT 2011 - jfehlig@suse.de
+
+- Move libvirt-iohelper from client to base package
+
 -------------------------------------------------------------------
 Tue Apr 12 05:11:22 UTC 2011 - coolo@opensuse.org
 
diff --git a/libvirt.spec b/libvirt.spec
index a642098..c02e0a8 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -331,6 +331,7 @@ Source0:        %{name}-%{version}.tar.bz2
 Source1:        libvirtd.init
 # Upstream patches
 Patch0:         f7e9b448-libxl-build.patch
+Patch1:         2999bb06-iohelper-libvirtd.patch
 # Need to go upstream
 Patch100:       xen-name-for-devid.patch
 Patch101:       clone.patch
@@ -447,6 +448,7 @@ Authors:
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 %patch100 -p1
 %patch101
 %patch102 -p1
@@ -758,6 +760,7 @@ fi
 %if %{with_storage_disk}
 %{_libdir}/%{name}/libvirt_parthelper
 %endif
+%{_libdir}/%{name}/libvirt_iohelper
 %doc %{_mandir}/man8/libvirtd.8*
 %endif
 
@@ -777,7 +780,6 @@ fi
 %{_localstatedir}/adm/fillup-templates/sysconfig.libvirt-guests
 %config /etc/init.d/libvirt-guests
 %{_sbindir}/rclibvirt-guests
-%{_libdir}/%{name}/libvirt_iohelper
 
 %dir %{_datadir}/libvirt/
 %dir %{_datadir}/libvirt/schemas/