diff --git a/.gitignore b/.gitignore
index edfc779..49c8320 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
 *.o
 *.a
+*.lo
+*.la
 
 # Visual Studio temp/user files
 *.user
@@ -13,4 +15,29 @@ Release
 Debug
 MinSizeRel
 RelWithDebInfo
-ipch
\ No newline at end of file
+ipch
+
+# files generated by autotools
+/aclocal.m4
+/autom4te.cache
+/config.guess
+/config.h
+/config.h.in
+/config.status
+/config.sub
+/configure
+/depcomp
+/install-sh
+/libtool
+/ltmain.sh
+/m4
+/missing
+/stamp-h*
+/test-driver
+/UnitTest++/TestUnitTest++
+Makefile
+Makefile.in
+.deps
+.libs
+*.log
+*.trs
diff --git a/Makefile.am b/Makefile.am
index 18f39ba..aac5b88 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,2 +1,3 @@
+ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = docs
 SUBDIRS = UnitTest++
diff --git a/UnitTest++/Makefile.am b/UnitTest++/Makefile.am
index 32bf52b..5ae9399 100644
--- a/UnitTest++/Makefile.am
+++ b/UnitTest++/Makefile.am
@@ -1,6 +1,6 @@
 lib_LTLIBRARIES = libUnitTest++.la
 pkgincludedir = $(includedir)/UnitTest++
-nobase_pkginclude_HEADERS = UnitTest++.h Config.h Test.h TestDetails.h TestList.h TestSuite.h TestResults.h TestMacros.h CheckMacros.h TestRunner.h TimeConstraint.h ExecuteTest.h AssertException.h MemoryOutStream.h CurrentTest.h Posix/SignalTranslator.h Checks.h TimeHelpers.h Posix/TimeHelpers.h
+nobase_pkginclude_HEADERS = UnitTest++.h UnitTestPP.h Config.h HelperMacros.h Test.h TestDetails.h TestList.h TestSuite.h TestResults.h TestMacros.h CheckMacros.h TestRunner.h TimeConstraint.h ExecuteTest.h AssertException.h MemoryOutStream.h CurrentTest.h Posix/SignalTranslator.h Checks.h TimeHelpers.h Posix/TimeHelpers.h ExceptionMacros.h ReportAssert.h ReportAssertImpl.h CompositeTestReporter.h
 libUnitTest___la_SOURCES = AssertException.cpp Test.cpp Checks.cpp TestRunner.cpp TestResults.cpp TestReporter.cpp TestReporterStdout.cpp ReportAssert.cpp TestList.cpp TimeConstraint.cpp TestDetails.cpp MemoryOutStream.cpp DeferredTestReporter.cpp DeferredTestResult.cpp XmlTestReporter.cpp CurrentTest.cpp Posix/SignalTranslator.cpp Posix/TimeHelpers.cpp CompositeTestReporter.cpp
 libUnitTest___la_LDFLAGS = -version-number @LIBUNITTEST_SO_VERSION@
 check_PROGRAMS = TestUnitTest++
diff --git a/configure.ac b/configure.ac
index 64ebc93..b486107 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,9 +4,10 @@
 AC_PREREQ([2.69])
 AC_INIT([UnitTest++], [1.4], [victor.lavaud@gmail.com])
 AC_CONFIG_SRCDIR([UnitTest++/TestDetails.cpp])
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 
-AM_INIT_AUTOMAKE()
+AM_INIT_AUTOMAKE([foreign])
 LT_INIT()
 
 AC_SUBST([LIBUNITTEST_SO_VERSION], [1:4:0])