diff --git a/dcapi/examples/uppercase-with-callback/Makefile.am b/dcapi/examples/uppercase-with-callback/Makefile.am
index c1340b31e0..65d1108db9 100644
--- a/dcapi/examples/uppercase-with-callback/Makefile.am
+++ b/dcapi/examples/uppercase-with-callback/Makefile.am
@@ -2,4 +2,38 @@ ACLOCAL_AMFLAGS = -I .
 
 AUTOMAKE_OPTIONS = 1.7
 
-SUBDIRS = src
+appdir = ${libdir}/boinc/apps/uppercase-example
+app_PROGRAMS =
+app_DATA =
+
+if BUILD_CLIENT
+app_PROGRAMS += uppercase-example-client
+app_DATA += uppercase-example-client.xml
+endif
+
+if BUILD_MASTER
+app_PROGRAMS += uppercase-example-master
+app_DATA += uppercase-example-master.xml
+endif
+
+CLEANFILES = uppercase-example-client.xml uppercase-example-master.xml
+
+uppercase_example_client_SOURCES = client.c
+uppercase_example_client_CPPFLAGS = $(DCAPI_CLIENT_CFLAGS)
+uppercase_example_client_LDADD = $(DCAPI_CLIENT_LIBS)
+
+uppercase_example_master_SOURCES = master.c
+uppercase_example_master_CPPFLAGS = $(DCAPI_MASTER_CFLAGS)
+uppercase_example_master_LDADD = $(DCAPI_MASTER_LIBS)
+
+uppercase-example-client.xml: uppercase-example-client.xml.in
+	$(SED) -e "s,@PACKAGE_VERSION\@,$(PACKAGE_VERSION)," \
+		-e "s,@appdir\@,$(appdir)," \
+		-e "s,@target\@,$(target_triplet)," \
+		$< > $@
+
+uppercase-example-master.xml: uppercase-example-master.xml.in
+	$(SED) -e "s,@PACKAGE_VERSION\@,$(PACKAGE_VERSION)," \
+		-e "s,@appdir\@,$(appdir)," \
+		-e "s,@target\@,$(target_triplet)," \
+		$< > $@
diff --git a/dcapi/examples/uppercase-with-callback/src/client.c b/dcapi/examples/uppercase-with-callback/client.c
similarity index 100%
rename from dcapi/examples/uppercase-with-callback/src/client.c
rename to dcapi/examples/uppercase-with-callback/client.c
diff --git a/dcapi/examples/uppercase-with-callback/configure.ac b/dcapi/examples/uppercase-with-callback/configure.ac
index 0c6a5b4087..5fb1bdb84b 100644
--- a/dcapi/examples/uppercase-with-callback/configure.ac
+++ b/dcapi/examples/uppercase-with-callback/configure.ac
@@ -33,5 +33,5 @@ if test "$enable_master" = yes; then
 	AC_MSG_NOTICE([will build master])
 fi
 
-AC_CONFIG_FILES([Makefile src/Makefile])
+AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/dcapi/examples/uppercase-with-callback/src/dc-api.conf b/dcapi/examples/uppercase-with-callback/dc-api.conf
similarity index 100%
rename from dcapi/examples/uppercase-with-callback/src/dc-api.conf
rename to dcapi/examples/uppercase-with-callback/dc-api.conf
diff --git a/dcapi/examples/uppercase-with-callback/src/input.txt b/dcapi/examples/uppercase-with-callback/input.txt
similarity index 100%
rename from dcapi/examples/uppercase-with-callback/src/input.txt
rename to dcapi/examples/uppercase-with-callback/input.txt
diff --git a/dcapi/examples/uppercase-with-callback/src/master.c b/dcapi/examples/uppercase-with-callback/master.c
similarity index 100%
rename from dcapi/examples/uppercase-with-callback/src/master.c
rename to dcapi/examples/uppercase-with-callback/master.c
diff --git a/dcapi/examples/uppercase-with-callback/src/Makefile.am b/dcapi/examples/uppercase-with-callback/src/Makefile.am
deleted file mode 100644
index f3eb90b0f9..0000000000
--- a/dcapi/examples/uppercase-with-callback/src/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-appdir = ${libdir}/boinc/apps/uppercase-example
-app_PROGRAMS =
-app_DATA =
-
-if BUILD_CLIENT
-app_PROGRAMS += uppercase-example-client
-app_DATA += uppercase-example-client.xml
-endif
-
-if BUILD_MASTER
-app_PROGRAMS += uppercase-example-master
-app_DATA += uppercase-example-master.xml
-endif
-
-CLEANFILES = uppercase-example-client.xml uppercase-example-master.xml
-
-uppercase_example_client_SOURCES = client.c
-uppercase_example_client_CPPFLAGS = $(DCAPI_CLIENT_CFLAGS)
-uppercase_example_client_LDADD = $(DCAPI_CLIENT_LIBS)
-
-uppercase_example_master_SOURCES = master.c
-uppercase_example_master_CPPFLAGS = $(DCAPI_MASTER_CFLAGS)
-uppercase_example_master_LDADD = $(DCAPI_MASTER_LIBS)
-
-uppercase-example-client.xml: uppercase-example-client.xml.in
-	$(SED) -e "s,@PACKAGE_VERSION\@,$(PACKAGE_VERSION)," \
-		-e "s,@appdir\@,$(appdir)," \
-		-e "s,@target\@,$(target_triplet)," \
-		$< > $@
-
-uppercase-example-master.xml: uppercase-example-master.xml.in
-	$(SED) -e "s,@PACKAGE_VERSION\@,$(PACKAGE_VERSION)," \
-		-e "s,@appdir\@,$(appdir)," \
-		-e "s,@target\@,$(target_triplet)," \
-		$< > $@
diff --git a/dcapi/examples/uppercase-with-callback/src/uppercase-example-client.xml.in b/dcapi/examples/uppercase-with-callback/uppercase-example-client.xml.in
similarity index 100%
rename from dcapi/examples/uppercase-with-callback/src/uppercase-example-client.xml.in
rename to dcapi/examples/uppercase-with-callback/uppercase-example-client.xml.in
diff --git a/dcapi/examples/uppercase-with-callback/src/uppercase-example-master.xml.in b/dcapi/examples/uppercase-with-callback/uppercase-example-master.xml.in
similarity index 100%
rename from dcapi/examples/uppercase-with-callback/src/uppercase-example-master.xml.in
rename to dcapi/examples/uppercase-with-callback/uppercase-example-master.xml.in