diff --git a/openbsc/Makefile.am b/openbsc/Makefile.am
index f7eda56..31a54ea 100644
--- a/openbsc/Makefile.am
+++ b/openbsc/Makefile.am
@@ -1,5 +1,8 @@
 AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
 
+## FIXME: automake >= 1.13 or autoconf >= 2.70 provide better suited AC_CONFIG_MACRO_DIRS for configure.ac
+## remove line below when OE toolchain is updated to version which include those
+ACLOCAL_AMFLAGS = -I m4
 AM_CPPFLAGS = \
 	$(all_includes) \
 	-I$(top_srcdir)/include \
diff --git a/openbsc/configure.ac b/openbsc/configure.ac
index 6d373a5..7e244bc 100644
--- a/openbsc/configure.ac
+++ b/openbsc/configure.ac
@@ -9,9 +9,6 @@
 AM_INIT_AUTOMAKE([dist-bzip2])
 AC_CONFIG_TESTDIR(tests)
 
-dnl FIXME: Remove this once we do not need local macro copies anymore (after upgrade to newer OE?)
-AC_CONFIG_MACRO_DIRS([m4])
-
 dnl kernel style compile messages
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])