diff --git a/Makefile.am b/Makefile.am
index 1208f18c..f1ff59cc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,6 @@
 
 AUTOMAKE_OPTIONS = gnu
+ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST = AUTHORS CREDITS COPYING NEWS autogen.sh  
 
@@ -16,8 +17,16 @@ MAINTAINERCLEANFILES=\
 	$(srcdir)/config.sub \
 	$(srcdir)/config.h.in \
 	$(srcdir)/config.h.in~ \
-	$(srcdir)/INSTALL
+	$(srcdir)/INSTALL \
+	$(srcdir)/m4/ltsugar.m4 \
+	$(srcdir)/m4/libtool.m4 \
+	$(srcdir)/m4/ltversion.m4 \
+	$(srcdir)/m4/lt~obsolete.m4 \
+	$(srcdir)/m4/ltoptions.m4
 
 SUBDIRS = include libfuse-lite libntfs-3g src
 
 doc_DATA = README
+
+dist-hook:
+	$(MKDIR_P) "$(distdir)/m4"
diff --git a/configure.ac b/configure.ac
index 8184d72b..1006509b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,7 @@ AC_CANONICAL_TARGET
 # Automake
 AM_INIT_AUTOMAKE([${PACKAGE_NAME}], [${PACKAGE_VERSION}])
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
 AM_MAINTAINER_MODE
 
 # Options
@@ -117,9 +118,15 @@ AC_GNU_SOURCE
 
 # Programs
 AC_PROG_CC
-AC_PROG_LIBTOOL
 AC_PROG_LN_S
 AM_PROG_CC_C_O
+
+ifdef(
+	[LT_INIT],
+	[LT_INIT],
+	[AC_PROG_LIBTOOL]
+)
+
 AC_PATH_PROG([MV], [mv])
 AC_PATH_PROG([RM], [rm])
 AC_PATH_PROG([SED], [sed])
diff --git a/m4/.keep b/m4/.keep
new file mode 100644
index 00000000..e69de29b