diff --git a/.gitignore b/.gitignore
index b60c16258739b1371ae1846010a50ce61cd81c7a..e5e078889c14b358c1974d4b4a32f54dfd47aa92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -111,6 +111,7 @@
 /src/access/viraccessapichecklxc.h
 /src/access/viraccessapicheckqemu.c
 /src/access/viraccessapicheckqemu.h
+/src/admin/admin_client.h
 /src/admin/admin_protocol.[ch]
 /src/esx/*.generated.*
 /src/hyperv/*.generated.*
diff --git a/cfg.mk b/cfg.mk
index 796ed80fa85568ad80c16b075a15d96cb19c1ea3..ce13f0ec8b0f115061c23ebe2c34761d88b9e4d8 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1070,13 +1070,16 @@ bracket-spacing-check:
 sc_po_check: \
 		$(srcdir)/daemon/remote_dispatch.h \
 		$(srcdir)/daemon/qemu_dispatch.h \
-		$(srcdir)/src/remote/remote_client_bodies.h
+		$(srcdir)/src/remote/remote_client_bodies.h \
+		$(srcdir)/src/admin/admin_client.h
 $(srcdir)/daemon/remote_dispatch.h: $(srcdir)/src/remote/remote_protocol.x
 	$(MAKE) -C daemon remote_dispatch.h
 $(srcdir)/daemon/qemu_dispatch.h: $(srcdir)/src/remote/qemu_protocol.x
 	$(MAKE) -C daemon qemu_dispatch.h
 $(srcdir)/src/remote/remote_client_bodies.h: $(srcdir)/src/remote/remote_protocol.x
 	$(MAKE) -C src remote/remote_client_bodies.h
+$(srcdir)/src/admin/admin_client.h: $(srcdir)/src/admin/admin_protocol.x
+	$(MAKE) -C src admin/admin_client.h
 
 # List all syntax-check exemptions:
 exclude_file_name_regexp--sc_avoid_strcase = ^tools/virsh\.h$$
diff --git a/src/Makefile.am b/src/Makefile.am
index 87d2bc5efaa6a90e88de4ca3fb51bd75995c9127..ce8d8fa2295c4d10f6d00fbadb1849bce34c7e8c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -396,7 +396,14 @@ ADMIN_PROTOCOL = $(srcdir)/admin/admin_protocol.x
 
 ADMIN_PROTOCOL_GENERATED = \
 		admin/admin_protocol.c	\
-		admin/admin_protocol.h
+		admin/admin_protocol.h	\
+		admin/admin_client.h
+
+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
 
 EXTRA_DIST += $(ADMIN_PROTOCOL) $(ADMIN_PROTOCOL_GENERATED)
 BUILT_SOURCES += $(ADMIN_PROTOCOL_GENERATED)