diff --git a/Makefile.am b/Makefile.am
index ffe051793ad060f9031256871a2dd71c28fe72f9..92980824e7c852472f6c2c83272848a94fff1548 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@
 LCOV = lcov
 GENHTML = genhtml
 
-SUBDIRS = . gnulib/lib include src daemon tools docs gnulib/tests \
+SUBDIRS = . gnulib/lib include/libvirt src daemon tools docs gnulib/tests \
   tests po examples
 
 ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index b1500f60bc5da3a99c48cc30651ecc1129f4847d..80e720a0f2030a79a472cb97cf2e79b5575442f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2757,7 +2757,7 @@ AC_DEFINE_UNQUOTED([base64_encode_alloc],[libvirt_gl_base64_encode_alloc],[Hack
 AC_CONFIG_FILES([run],
                 [chmod +x,-w run])
 AC_CONFIG_FILES([\
-        Makefile src/Makefile include/Makefile docs/Makefile \
+        Makefile src/Makefile include/libvirt/Makefile docs/Makefile \
         gnulib/lib/Makefile \
         gnulib/tests/Makefile \
         libvirt.pc \
diff --git a/include/Makefile.am b/include/libvirt/Makefile.am
similarity index 76%
rename from include/Makefile.am
rename to include/libvirt/Makefile.am
index dde955e391a6ad3e697cc79718a780a55e613b8f..a59b8ab16cbb727030de39b41513a200b7053dc0 100644
--- a/include/Makefile.am
+++ b/include/libvirt/Makefile.am
@@ -18,15 +18,15 @@
 
 virincdir = $(includedir)/libvirt
 
-allheaders = $(wildcard $(srcdir)/libvirt/*.h)
-virinc_HEADERS = $(filter-out $(srcdir)/libvirt/libvirt-admin.h \
-				 $(srcdir)/libvirt/libvirt-common.h, $(allheaders))
-virinc_HEADERS += libvirt/libvirt-common.h
+allheaders = $(wildcard $(srcdir)/*.h)
+virinc_HEADERS = $(filter-out $(srcdir)/libvirt-admin.h \
+				 $(srcdir)/libvirt-common.h, $(allheaders))
+virinc_HEADERS += libvirt-common.h
 
-EXTRA_DIST = libvirt/libvirt-common.h.in
+EXTRA_DIST = libvirt-common.h.in
 
 # Temporarily disabled, but we need it for building
-EXTRA_DIST += libvirt/libvirt-admin.h
+EXTRA_DIST += libvirt-admin.h
 
 install-exec-hook:
 	$(mkinstalldirs) $(DESTDIR)$(virincdir)