diff --git a/Makefile.am b/Makefile.am
index beddca725c94ad5c3005f318a95ce43771b61e73..17fbf439e1ed33282f754ffc9c783bf3bb781081 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@
 LCOV = lcov
 GENHTML = genhtml
 
-SUBDIRS = gnulib/lib include src qemud tools proxy docs gnulib/tests \
+SUBDIRS = gnulib/lib include src daemon tools proxy docs gnulib/tests \
   python tests po examples/domain-events/events-c examples/hellolibvirt
 
 ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4
@@ -40,7 +40,7 @@ tests:
 
 cov: clean-cov
 	mkdir $(top_builddir)/coverage
-	$(LCOV) -c -o $(top_builddir)/coverage/libvirt.info.tmp -d $(top_srcdir)/src  -d $(top_srcdir)/qemud -d $(top_srcdir)/tests
+	$(LCOV) -c -o $(top_builddir)/coverage/libvirt.info.tmp -d $(top_srcdir)/src  -d $(top_srcdir)/daemon -d $(top_srcdir)/tests
 	$(LCOV) -r $(top_builddir)/coverage/libvirt.info.tmp -o $(top_builddir)/coverage/libvirt.info *usr*
 	rm $(top_builddir)/coverage/libvirt.info.tmp
 	$(GENHTML) -s -t "libvirt" -o $(top_builddir)/coverage --legend $(top_builddir)/coverage/libvirt.info
diff --git a/configure.in b/configure.in
index da0223e141df843325c395dc737c922124615647..5d498ae85279803f3bfa28c4d4a006f2b705fc35 100644
--- a/configure.in
+++ b/configure.in
@@ -1694,7 +1694,7 @@ AC_OUTPUT(Makefile src/Makefile include/Makefile docs/Makefile \
           po/Makefile.in \
 	  include/libvirt/Makefile include/libvirt/libvirt.h \
 	  python/Makefile python/tests/Makefile \
-          qemud/Makefile \
+          daemon/Makefile \
           tools/Makefile \
           tests/Makefile proxy/Makefile \
           tests/xml2sexprdata/Makefile \
diff --git a/qemud/.gitignore b/daemon/.gitignore
similarity index 100%
rename from qemud/.gitignore
rename to daemon/.gitignore
diff --git a/qemud/Makefile.am b/daemon/Makefile.am
similarity index 100%
rename from qemud/Makefile.am
rename to daemon/Makefile.am
diff --git a/qemud/THREADING.txt b/daemon/THREADING.txt
similarity index 100%
rename from qemud/THREADING.txt
rename to daemon/THREADING.txt
diff --git a/qemud/default-network.xml b/daemon/default-network.xml
similarity index 100%
rename from qemud/default-network.xml
rename to daemon/default-network.xml
diff --git a/qemud/dispatch.c b/daemon/dispatch.c
similarity index 100%
rename from qemud/dispatch.c
rename to daemon/dispatch.c
diff --git a/qemud/dispatch.h b/daemon/dispatch.h
similarity index 100%
rename from qemud/dispatch.h
rename to daemon/dispatch.h
diff --git a/qemud/event.c b/daemon/event.c
similarity index 100%
rename from qemud/event.c
rename to daemon/event.c
diff --git a/qemud/event.h b/daemon/event.h
similarity index 100%
rename from qemud/event.h
rename to daemon/event.h
diff --git a/qemud/libvirtd.aug b/daemon/libvirtd.aug
similarity index 100%
rename from qemud/libvirtd.aug
rename to daemon/libvirtd.aug
diff --git a/qemud/libvirtd.conf b/daemon/libvirtd.conf
similarity index 100%
rename from qemud/libvirtd.conf
rename to daemon/libvirtd.conf
diff --git a/qemud/libvirtd.init.in b/daemon/libvirtd.init.in
similarity index 100%
rename from qemud/libvirtd.init.in
rename to daemon/libvirtd.init.in
diff --git a/qemud/libvirtd.logrotate.in b/daemon/libvirtd.logrotate.in
similarity index 100%
rename from qemud/libvirtd.logrotate.in
rename to daemon/libvirtd.logrotate.in
diff --git a/qemud/libvirtd.policy-0 b/daemon/libvirtd.policy-0
similarity index 100%
rename from qemud/libvirtd.policy-0
rename to daemon/libvirtd.policy-0
diff --git a/qemud/libvirtd.policy-1 b/daemon/libvirtd.policy-1
similarity index 100%
rename from qemud/libvirtd.policy-1
rename to daemon/libvirtd.policy-1
diff --git a/qemud/libvirtd.sasl b/daemon/libvirtd.sasl
similarity index 100%
rename from qemud/libvirtd.sasl
rename to daemon/libvirtd.sasl
diff --git a/qemud/libvirtd.sysconf b/daemon/libvirtd.sysconf
similarity index 100%
rename from qemud/libvirtd.sysconf
rename to daemon/libvirtd.sysconf
diff --git a/qemud/libvirtd_qemu.aug b/daemon/libvirtd_qemu.aug
similarity index 100%
rename from qemud/libvirtd_qemu.aug
rename to daemon/libvirtd_qemu.aug
diff --git a/qemud/mdns.c b/daemon/mdns.c
similarity index 100%
rename from qemud/mdns.c
rename to daemon/mdns.c
diff --git a/qemud/mdns.h b/daemon/mdns.h
similarity index 100%
rename from qemud/mdns.h
rename to daemon/mdns.h
diff --git a/qemud/qemud.c b/daemon/qemud.c
similarity index 100%
rename from qemud/qemud.c
rename to daemon/qemud.c
diff --git a/qemud/qemud.h b/daemon/qemud.h
similarity index 100%
rename from qemud/qemud.h
rename to daemon/qemud.h
diff --git a/qemud/remote.c b/daemon/remote.c
similarity index 100%
rename from qemud/remote.c
rename to daemon/remote.c
diff --git a/qemud/remote.h b/daemon/remote.h
similarity index 100%
rename from qemud/remote.h
rename to daemon/remote.h
diff --git a/qemud/remote_dispatch_args.h b/daemon/remote_dispatch_args.h
similarity index 100%
rename from qemud/remote_dispatch_args.h
rename to daemon/remote_dispatch_args.h
diff --git a/qemud/remote_dispatch_prototypes.h b/daemon/remote_dispatch_prototypes.h
similarity index 100%
rename from qemud/remote_dispatch_prototypes.h
rename to daemon/remote_dispatch_prototypes.h
diff --git a/qemud/remote_dispatch_ret.h b/daemon/remote_dispatch_ret.h
similarity index 100%
rename from qemud/remote_dispatch_ret.h
rename to daemon/remote_dispatch_ret.h
diff --git a/qemud/remote_dispatch_table.h b/daemon/remote_dispatch_table.h
similarity index 100%
rename from qemud/remote_dispatch_table.h
rename to daemon/remote_dispatch_table.h
diff --git a/qemud/remote_generate_stubs.pl b/daemon/remote_generate_stubs.pl
similarity index 100%
rename from qemud/remote_generate_stubs.pl
rename to daemon/remote_generate_stubs.pl
diff --git a/qemud/remote_protocol.c b/daemon/remote_protocol.c
similarity index 100%
rename from qemud/remote_protocol.c
rename to daemon/remote_protocol.c
diff --git a/qemud/remote_protocol.h b/daemon/remote_protocol.h
similarity index 100%
rename from qemud/remote_protocol.h
rename to daemon/remote_protocol.h
diff --git a/qemud/remote_protocol.x b/daemon/remote_protocol.x
similarity index 100%
rename from qemud/remote_protocol.x
rename to daemon/remote_protocol.x
diff --git a/qemud/rpcgen_fix.pl b/daemon/rpcgen_fix.pl
similarity index 100%
rename from qemud/rpcgen_fix.pl
rename to daemon/rpcgen_fix.pl
diff --git a/qemud/test_libvirtd.aug b/daemon/test_libvirtd.aug
similarity index 100%
rename from qemud/test_libvirtd.aug
rename to daemon/test_libvirtd.aug
diff --git a/qemud/test_libvirtd_qemu.aug b/daemon/test_libvirtd_qemu.aug
similarity index 100%
rename from qemud/test_libvirtd_qemu.aug
rename to daemon/test_libvirtd_qemu.aug
diff --git a/src/Makefile.am b/src/Makefile.am
index 463252e32061994a5b40a2aa1c8ea29ccd3996c8..b1d01ba42fc2ca2ad52fbdc3cab1416e8ee7045b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = \
 	   -I$(top_srcdir)/gnulib/lib -I../gnulib/lib \
 	   -I../include \
 	   -I@top_srcdir@/include \
-	   -I@top_srcdir@/qemud \
+	   -I@top_srcdir@/daemon \
 	   $(LIBXML_CFLAGS) \
 	   $(LIBSSH2_CFLAGS) \
 	   $(XEN_CFLAGS) \
@@ -100,8 +100,8 @@ SECRET_CONF_SOURCES =						\
 REMOTE_DRIVER_SOURCES =						\
 		gnutls_1_0_compat.h				\
 		remote_internal.c remote_internal.h		\
-		../qemud/remote_protocol.c			\
-		../qemud/remote_protocol.h
+		../daemon/remote_protocol.c			\
+		../daemon/remote_protocol.h
 
 # Mock driver, covering domains, storage, networks, etc
 TEST_DRIVER_SOURCES =						\
diff --git a/src/remote_internal.c b/src/remote_internal.c
index dd7b31e8aa32b052eb023f118b94309ce0e6f9d3..3ffda35c944e216220d5dd7175d0978a9e570d9c 100644
--- a/src/remote_internal.c
+++ b/src/remote_internal.c
@@ -5650,7 +5650,7 @@ remoteAuthenticate (virConnectPtr conn, struct private_data *priv, int in_open,
 
 #if HAVE_SASL
 /*
- * NB, keep in sync with similar method in qemud/remote.c
+ * NB, keep in sync with similar method in remote/remote.c
  */
 static char *addrToString(struct sockaddr_storage *sa, socklen_t salen)
 {
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 74e98d113a6487ecaa77b1ca05e4cdb49a173f28..5b99c5dfde96210561d7e728797cc4865ca4cce4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -147,7 +147,7 @@ TESTS += nodedevxml2xmltest
 
 TESTS += interfacexml2xmltest
 
-path_add = $$abs_top_builddir/src$(PATH_SEPARATOR)$$abs_top_builddir/qemud
+path_add = $$abs_top_builddir/src$(PATH_SEPARATOR)$$abs_top_builddir/daemon
 
 # NB, automake < 1.10 does not provide the real
 # abs_top_{src/build}dir variables, so don't rely
@@ -261,7 +261,7 @@ qparamtest_LDADD = $(LDADDS)
 
 if WITH_LIBVIRTD
 eventtest_SOURCES = \
-	eventtest.c testutils.h testutils.c ../qemud/event.c
+	eventtest.c testutils.h testutils.c ../daemon/event.c
 eventtest_LDADD = -lrt $(LDADDS)
 endif
 
diff --git a/tests/daemon-conf b/tests/daemon-conf
index 4fa82a42ec9b061fba59dea71b5477929eeb4885..071497e1e4632f8a74f419922b1805ccc221bedd 100755
--- a/tests/daemon-conf
+++ b/tests/daemon-conf
@@ -13,7 +13,7 @@ test -z "$abs_top_srcdir" && abs_top_srcdir=$(pwd)/..
 grep '^#define WITH_QEMU 1' $CONFIG_HEADER > /dev/null ||
   skip_test_ "configured without QEMU support"
 
-conf="$abs_top_srcdir/qemud/libvirtd.conf"
+conf="$abs_top_srcdir/daemon/libvirtd.conf"
 
 # Ensure that each commented out PARAMETER = VALUE line has the expected form.
 grep '[a-z_]  *=  *[^ ]' "$conf" | grep -vE '^#[a-z_]+ = ' \
diff --git a/tests/eventtest.c b/tests/eventtest.c
index da3438828570266f0d81e44871ad4e434488e1f1..90c60bb9ad964994ca0c22be38de94f8bc4468c4 100644
--- a/tests/eventtest.c
+++ b/tests/eventtest.c
@@ -31,7 +31,7 @@
 #include "threads.h"
 #include "logging.h"
 #include "util.h"
-#include "../qemud/event.h"
+#include "../daemon/event.h"
 
 #define NUM_FDS 5
 #define NUM_TIME 5