diff --git a/.gitignore b/.gitignore
index 255f7b0..36b1d42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@
 src/.deps
 src/test_*
 macosx/build/
+/m4
diff --git a/Makefile.am b/Makefile.am
index 8bfe303..0736064 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,6 +3,7 @@
 
 #AUTOMAKE_OPTIONS = foreign 1.6 dist-zip
 AUTOMAKE_OPTIONS = foreign 1.11 dist-zip dist-xz
+ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = src include doc
 
diff --git a/autogen.sh b/autogen.sh
index c9782e1..f6490cc 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -9,4 +9,5 @@
 
 echo "Updating build configuration files for $package, please wait...."
 
+mkdir -p m4
 autoreconf -if
diff --git a/configure.ac b/configure.ac
index 588d2f5..ee29978 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,6 +2,8 @@
 
 AC_INIT([libogg],[1.3.3],[ogg-dev@xiph.org])
 
+LT_INIT
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(src/framing.c)
 
 AM_INIT_AUTOMAKE
@@ -17,7 +19,6 @@
 AC_SUBST(LIB_AGE)
 
 AC_PROG_CC
-AM_PROG_LIBTOOL
 AM_PROG_CC_C_O
 
 dnl Set some options based on environment