diff --git a/Makefile.am b/Makefile.am
index 86470e6..e3a5f31 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = 1.9 foreign
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS =	conf doc src win32
+SUBDIRS =	conf doc m4 src win32
 
 dist_doc_DATA = COPYING README
 
diff --git a/configure.in b/configure.in
index 3dac128..1158358 100644
--- a/configure.in
+++ b/configure.in
@@ -97,6 +97,7 @@ dnl OUTPUT
 AC_CONFIG_FILES(Makefile \
 		conf/Makefile \
 		doc/Makefile \
+		m4/Makefile \
 		src/Makefile \
 		win32/Makefile)
 
diff --git a/m4/Makefile.am b/m4/Makefile.am
new file mode 100644
index 0000000..c404981
--- /dev/null
+++ b/m4/Makefile.am
@@ -0,0 +1,5 @@
+AUTOMAKE_OPTIONS = 1.9 foreign
+
+EXTRA_DIST =	ogg.m4 shout.m4 vorbis.m4 xiph_compiler.m4 xiph_xml2.m4
+
+CLEANFILES =	core *.core *~ .*~