diff --git a/.gitignore b/.gitignore
index 58ff835..16aef12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@
 /ndn-cpp/stamp-h1
 /aclocal.m4
 /libtool
+/m4/*
 *.Po
 .deps
 .dirstamp
diff --git a/Makefile.am b/Makefile.am
index 663e85e..dc13961 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@
 ## Additional flags to pass to aclocal when it is invoked automatically at
 ## make time. The ${ACLOCAL_FLAGS} variable is picked up from the environment
 ## to provide a way for the user to supply additional arguments.
-ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
+ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
 
 lib_LTLIBRARIES = libndn-c.la libndn-cpp.la
 
diff --git a/Makefile.in b/Makefile.in
index 6a27ded..48305a1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -93,7 +93,10 @@
 	bin/test-get-async$(EXEEXT) bin/test-publish-async$(EXEEXT)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -500,7 +503,7 @@
 @DX_COND_doc_TRUE@    $(DX_CLEAN_LATEX)
 
 AUTOMAKE_OPTIONS = subdir-objects
-ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
+ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
 lib_LTLIBRARIES = libndn-c.la libndn-cpp.la
 
 # Just the C code.
diff --git a/configure b/configure
index 93c8e72..c5373db 100755
--- a/configure
+++ b/configure
@@ -3230,6 +3230,7 @@
 fi
 
 
+
 # Create config.h without prefixes.
 ac_config_headers="$ac_config_headers config.h"
 
@@ -8509,6 +8510,10 @@
 $RM -r conftest*
 
 
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
 if test -n "$compiler"; then
 
 lt_prog_compiler_no_builtin_flag=
@@ -12048,6 +12053,8 @@
 # Only expand once:
 
 
+
+
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
diff --git a/configure.ac b/configure.ac
index c422503..dc9a530 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,6 +14,7 @@
 AC_INIT([ndn-cpp], [0.2], [ndn-lib@lists.cs.ucla.edu], [ndn-cpp], [https://github.com/named-data/ndn-cpp])
 AM_INIT_AUTOMAKE([1.10 -Wall no-define foreign])
 
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([config.h.in])
 # Create config.h without prefixes.
 AC_CONFIG_HEADERS(config.h)
@@ -22,6 +23,8 @@
 AM_MAINTAINER_MODE
 AM_PROG_AR
 AC_PROG_LIBTOOL
+LT_PREREQ([2.2])
+LT_INIT()
 AC_PROG_CXX
 AM_PROG_CC_C_O
 AC_PROG_OBJCXX