diff --git a/.gitignore b/.gitignore
index 03c23e4e8..4ca23fa00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,15 +3,20 @@
 aclocal.m4
 autom4te.cache/
 compile
+config.guess
 config.log
 config.status
+config.sub
 configure
 depcomp
 install-sh
+m4/
+libtool
+ltmain.sh
 missing
 Makefile
 Makefile.in
-tss/
+src/.dirstamp
 src/libcommon.a
 src/tpm2_activatecredential
 src/tpm2_hash
diff --git a/Makefile.am b/Makefile.am
index 9d4079413..c8484ecea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,6 +30,8 @@
 # THE POSSIBILITY OF SUCH DAMAGE.
 #;**********************************************************************;
 
+ACLOCAL_AMFLAGS = -I m4
+
 INCLUDE_DIRS = -I$(srcdir)
 
 AM_CFLAGS   = -DSAPI_CLIENT $(INCLUDE_DIRS)
diff --git a/bootstrap b/bootstrap
index fb1e67f9c..fa3329401 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,10 @@
 #! /bin/sh
 
-aclocal \
-&& autoconf \
-&& automake --add-missing
-
+printf "Running libtoolize ...\n"
+libtoolize --install
+printf "Running aclocal ...\n"
+aclocal
+printf "Running autoconf ...\n"
+autoconf
+printf "Running automake ...\n"
+automake --add-missing
diff --git a/configure.ac b/configure.ac
index 8708fb62b..a3ef4704a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,8 @@
 AC_INIT([tpm2.0-tools], [1.0.0])
+AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_CC
 AC_PROG_CXX
-AC_PROG_RANLIB
+LT_INIT
 AM_INIT_AUTOMAKE([foreign
                   subdir-objects])
 AC_CONFIG_FILES([Makefile])