diff --git a/src/Makefile.am b/src/Makefile.am
index 967d825ebbb2df95c5f2cba1c3f07fc2450feec1..38f63c0c48448cf575c8909ee2e9c17d9fabbab7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -98,6 +98,7 @@ include security/Makefile.inc.am
 include access/Makefile.inc.am
 include logging/Makefile.inc.am
 include locking/Makefile.inc.am
+include admin/Makefile.inc.am
 include uml/Makefile.inc.am
 include phyp/Makefile.inc.am
 include test/Makefile.inc.am
@@ -358,30 +359,6 @@ DRIVER_SOURCES += \
 
 
 
-ADMIN_PROTOCOL = $(srcdir)/admin/admin_protocol.x
-
-ADMIN_PROTOCOL_GENERATED = \
-		admin/admin_protocol.c \
-		admin/admin_protocol.h \
-		admin/admin_client.h \
-		admin/admin_server_dispatch_stubs.h \
-		$(NULL)
-
-admin/admin_client.h: $(srcdir)/rpc/gendispatch.pl \
-		$(ADMIN_PROTOCOL) Makefile.am
-	$(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=client \
-	  admin ADMIN $(ADMIN_PROTOCOL) \
-	  > $(srcdir)/admin/admin_client.h
-
-admin/admin_server_dispatch_stubs.h: $(srcdir)/rpc/gendispatch.pl \
-		$(ADMIN_PROTOCOL) Makefile.am
-	$(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=server \
-	  admin ADMIN $(ADMIN_PROTOCOL) \
-	  > $(srcdir)/admin/admin_server_dispatch_stubs.h
-
-EXTRA_DIST += $(ADMIN_PROTOCOL) $(ADMIN_PROTOCOL_GENERATED)
-BUILT_SOURCES += $(ADMIN_PROTOCOL_GENERATED)
-MAINTAINERCLEANFILES += $(ADMIN_PROTOCOL_GENERATED)
 
 # Ensure that we don't change the struct or member names or member ordering
 # in remote_protocol.x  The embedded perl below needs a few comments, and
@@ -758,31 +735,6 @@ libvirt_admin.syms: libvirt_admin_public.syms $(ADMIN_SYM_FILES) \
 	mv $@-tmp libvirt_admin.syms
 
 
-admin/admin_server_dispatch.c: admin/admin_server_dispatch_stubs.h
-
-noinst_LTLIBRARIES += libvirt_driver_admin.la
-libvirt_driver_admin_la_SOURCES = \
-		admin/admin_protocol.c \
-		admin/admin_protocol.h \
-		admin/admin_server.c \
-		admin/admin_server.h \
-		admin/admin_server_dispatch.c \
-		admin/admin_server_dispatch.h \
-		admin/admin_server_dispatch_stubs.h \
-		$(NULL)
-libvirt_driver_admin_la_CFLAGS = \
-		$(AM_CFLAGS) \
-		$(XDR_CFLAGS) \
-		-I$(top_srcdir)/src/util \
-		-I$(top_srcdir)/src/admin \
-		$(NULL)
-libvirt_driver_admin_la_LIBADD = ../gnulib/lib/libgnu.la
-libvirt_driver_admin_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
-
-# admin/admin_remote.c is being included in libvirt-admin.c, so we
-# need to include it in the dist
-EXTRA_DIST += admin/admin_remote.c
-
 lib_LTLIBRARIES += libvirt-admin.la
 libvirt_admin_la_SOURCES = \
 		libvirt-admin.c \
diff --git a/src/admin/Makefile.inc.am b/src/admin/Makefile.inc.am
new file mode 100644
index 0000000000000000000000000000000000000000..55d721f0bf4800b84b67bfe9c45016260f92cb20
--- /dev/null
+++ b/src/admin/Makefile.inc.am
@@ -0,0 +1,50 @@
+ADMIN_PROTOCOL = $(srcdir)/admin/admin_protocol.x
+
+ADMIN_PROTOCOL_GENERATED = \
+	admin/admin_protocol.c \
+	admin/admin_protocol.h \
+	admin/admin_client.h \
+	admin/admin_server_dispatch_stubs.h \
+	$(NULL)
+
+EXTRA_DIST += $(ADMIN_PROTOCOL) $(ADMIN_PROTOCOL_GENERATED)
+BUILT_SOURCES += $(ADMIN_PROTOCOL_GENERATED)
+MAINTAINERCLEANFILES += $(ADMIN_PROTOCOL_GENERATED)
+
+admin/admin_server_dispatch.c: admin/admin_server_dispatch_stubs.h
+
+noinst_LTLIBRARIES += libvirt_driver_admin.la
+libvirt_driver_admin_la_SOURCES = \
+	admin/admin_protocol.c \
+	admin/admin_protocol.h \
+	admin/admin_server.c \
+	admin/admin_server.h \
+	admin/admin_server_dispatch.c \
+	admin/admin_server_dispatch.h \
+	admin/admin_server_dispatch_stubs.h \
+	$(NULL)
+libvirt_driver_admin_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(XDR_CFLAGS) \
+	-I$(top_srcdir)/src/util \
+	-I$(top_srcdir)/src/admin \
+	$(NULL)
+libvirt_driver_admin_la_LIBADD = ../gnulib/lib/libgnu.la
+libvirt_driver_admin_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
+
+# admin/admin_remote.c is being included in libvirt-admin.c, so we
+# need to include it in the dist
+EXTRA_DIST += admin/admin_remote.c
+
+
+admin/admin_client.h: $(srcdir)/rpc/gendispatch.pl \
+		$(ADMIN_PROTOCOL) Makefile.am
+	$(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=client \
+	  admin ADMIN $(ADMIN_PROTOCOL) \
+	  > $(srcdir)/admin/admin_client.h
+
+admin/admin_server_dispatch_stubs.h: $(srcdir)/rpc/gendispatch.pl \
+		$(ADMIN_PROTOCOL) Makefile.am
+	$(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=server \
+	  admin ADMIN $(ADMIN_PROTOCOL) \
+	  > $(srcdir)/admin/admin_server_dispatch_stubs.h