diff --git a/src/Makefile.am b/src/Makefile.am
index 814f3acb0615624c18f6486a86b0292a9d884e96..8b1e4c8a4e0ebc49b79e3110aace678a733b805c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -107,6 +107,7 @@ include phyp/Makefile.inc.am
 include test/Makefile.inc.am
 include esx/Makefile.inc.am
 include hyperv/Makefile.inc.am
+include vmx/Makefile.inc.am
 include vmware/Makefile.inc.am
 include vbox/Makefile.inc.am
 include openvz/Makefile.inc.am
@@ -361,9 +362,6 @@ check-local: check-protocol check-symfile check-symsorting \
 
 
 
-VMX_SOURCES = \
-		vmx/vmx.c vmx/vmx.h
-
 
 pkgdata_DATA =	cpu/cpu_map.xml
 
@@ -376,15 +374,6 @@ EXTRA_DIST +=	$(pkgdata_DATA)
 # First deal with sources usable in non-daemon context
 
 
-if WITH_VMX
-noinst_LTLIBRARIES += libvirt_vmx.la
-libvirt_la_BUILT_LIBADD += libvirt_vmx.la
-libvirt_vmx_la_CFLAGS = \
-		-I$(srcdir)/conf $(AM_CFLAGS)
-libvirt_vmx_la_SOURCES = $(VMX_SOURCES)
-endif WITH_VMX
-
-
 noinst_LTLIBRARIES += libvirt_driver.la
 libvirt_la_BUILT_LIBADD += libvirt_driver.la
 libvirt_driver_la_SOURCES = $(DRIVER_SOURCES)
@@ -455,12 +444,6 @@ else ! WITH_LINUX
 SYM_FILES += $(srcdir)/libvirt_linux.syms
 endif ! WITH_LINUX
 
-if WITH_VMX
-USED_SYM_FILES += $(srcdir)/libvirt_vmx.syms
-else ! WITH_VMX
-SYM_FILES += $(srcdir)/libvirt_vmx.syms
-endif ! WITH_VMX
-
 if WITH_SASL
 USED_SYM_FILES += $(srcdir)/libvirt_sasl.syms
 else ! WITH_SASL
diff --git a/src/vmx/Makefile.inc.am b/src/vmx/Makefile.inc.am
new file mode 100644
index 0000000000000000000000000000000000000000..b9bf6ef690f25f8b251fa5fa185953f2fafb116e
--- /dev/null
+++ b/src/vmx/Makefile.inc.am
@@ -0,0 +1,22 @@
+VMX_SOURCES = \
+	vmx/vmx.c \
+	vmx/vmx.h \
+	$(NULL)
+
+EXTRA_DIST += $(VMX_SOURCES)
+
+if WITH_VMX
+noinst_LTLIBRARIES += libvirt_vmx.la
+libvirt_la_BUILT_LIBADD += libvirt_vmx.la
+libvirt_vmx_la_CFLAGS = \
+	-I$(srcdir)/conf \
+	$(AM_CFLAGS) \
+	$(NULL)
+libvirt_vmx_la_SOURCES = $(VMX_SOURCES)
+endif WITH_VMX
+
+if WITH_VMX
+USED_SYM_FILES += $(srcdir)/libvirt_vmx.syms
+else ! WITH_VMX
+SYM_FILES += $(srcdir)/libvirt_vmx.syms
+endif ! WITH_VMX