diff --git a/examples/Makefile.am b/examples/Makefile.am
index a105c49..9f2cda7 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -9,7 +9,7 @@ AM_CFLAGS = \
 	$(COGL_DEP_CFLAGS) \
 	$(COGL_EXTRA_CFLAGS) \
 	-DCOGL_ENABLE_EXPERIMENTAL_2_0_API \
-	-DCOGL_EXAMPLES_DATA=\""$(abs_top_srcdir)/examples/"\"
+	-DCOGL_EXAMPLES_DATA=\""/usr/share/cogl/"\"
 
 AM_CPPFLAGS = \
 	-DG_DISABLE_SINGLE_INCLUDES \
@@ -20,34 +20,34 @@ common_ldadd = \
 	$(COGL_DEP_LIBS) \
 	$(top_builddir)/cogl/libcogl.la
 
-noinst_PROGRAMS = hello
-
-hello_SOURCES = hello.c
-hello_LDADD = $(common_ldadd)
+bin_PROGRAMS = cogl-hello
+cogl_hello_SOURCES = hello.c
+cogl_hello_LDADD = $(common_ldadd)
 
 if BUILD_COGL_PANGO
-noinst_PROGRAMS += crate
-crate_SOURCES = crate.c
-crate_LDADD = $(common_ldadd) $(top_builddir)/cogl-pango/libcogl-pango.la
-crate_CFLAGS = $(AM_CFLAGS) $(COGL_PANGO_DEP_CFLAGS)
+bin_PROGRAMS += cogl-crate
+cogl_crate_SOURCES = crate.c
+cogl_crate_LDADD = $(common_ldadd) $(top_builddir)/cogl-pango/libcogl-pango.la
+cogl_crate_CFLAGS = $(AM_CFLAGS) $(COGL_PANGO_DEP_CFLAGS)
+
+dist_pkgdata_DATA = crate.jpg
 endif
 
 if X11_TESTS
-noinst_PROGRAMS += x11-foreign x11-tfp
-x11_foreign_SOURCES = x11-foreign.c
-x11_foreign_LDADD = $(common_ldadd)
-x11_tfp_SOURCES = x11-tfp.c
-x11_tfp_LDADD = $(common_ldadd)
+bin_PROGRAMS += cogl-x11-foreign cogl-x11-tfp
+cogl_x11_foreign_SOURCES = x11-foreign.c
+cogl_x11_foreign_LDADD = $(common_ldadd)
+cogl_x11_tfp_SOURCES = x11-tfp.c
+cogl_x11_tfp_LDADD = $(common_ldadd)
 endif
 
 if SUPPORT_WAYLAND_EGL_SERVER
-noinst_PROGRAMS += cogland
+bin_PROGRAMS += cogland
 cogland_SOURCES = cogland.c
 cogland_LDADD = $(common_ldadd)
 endif
 
 EXTRA_DIST = \
-	crate.jpg \
 	android/hello/AndroidManifest.xml \
 	android/hello/jni/Application.mk \
 	android/hello/jni/Android.mk \
