diff --git a/Makefile.am b/Makefile.am
index 38ef2ad..4ea52cb 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
 AM_DEFAULT_SOURCE_EXT = .cpp
 
+ACLOCAL_AMFLAGS = -Im4
+
 sbin_PROGRAMS = \
 	openpower-version-host-software-manager \
 	openpower-update-manager
diff --git a/configure.ac b/configure.ac
index 9c0b406..c8c90a7 100755
--- a/configure.ac
+++ b/configure.ac
@@ -5,6 +5,8 @@
 AM_INIT_AUTOMAKE([subdir-objects -Wall -Werror foreign dist-xz])
 AM_SILENT_RULES([yes])
 
+AC_CONFIG_MACRO_DIRS([m4])
+
 # Checks for programs
 AC_PROG_CXX
 AC_PROG_INSTALL #Checks/sets the install variable to be used
diff --git a/m4/.gitkeep b/m4/.gitkeep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/m4/.gitkeep