diff --git a/dcapi/examples/uppercase-with-callback/Makefile.am b/dcapi/examples/uppercase-with-callback/Makefile.am
index 078b061ea8..cc5a6ca753 100644
--- a/dcapi/examples/uppercase-with-callback/Makefile.am
+++ b/dcapi/examples/uppercase-with-callback/Makefile.am
@@ -1,4 +1,5 @@
 ACLOCAL_AMFLAGS = -I cf
-AUTOMAKE_OPTIONS = foreign 1.7
+
+AUTOMAKE_OPTIONS = 1.7
 
 SUBDIRS = src
diff --git a/dcapi/examples/uppercase-with-callback/configure.ac b/dcapi/examples/uppercase-with-callback/configure.ac
index d37488a0f4..0c6a5b4087 100644
--- a/dcapi/examples/uppercase-with-callback/configure.ac
+++ b/dcapi/examples/uppercase-with-callback/configure.ac
@@ -1,8 +1,6 @@
 AC_INIT([Uppercase Example Application], [5.01], [desktopgrid@lpds.sztaki.hu], [uppercase-example])
-AC_CONFIG_MACRO_DIR([cf])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/client.c])
-AC_CONFIG_AUX_DIR([scripts])
 
 dnl The platform code uses the target triplet
 AC_CANONICAL_TARGET
diff --git a/dcapi/examples/uppercase-with-callback/cf/dcapi.m4 b/dcapi/examples/uppercase-with-callback/dcapi.m4
similarity index 100%
rename from dcapi/examples/uppercase-with-callback/cf/dcapi.m4
rename to dcapi/examples/uppercase-with-callback/dcapi.m4