diff --git a/Makefile.am b/Makefile.am
index 7dc264529a..8916210546 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
 
-SUBDIRS = ges tests common m4 docs
+SUBDIRS = ges tests tools common m4 docs
 
 DIST_SUBDIRS = $(SUBDIRS)
 
diff --git a/configure.ac b/configure.ac
index 6f34e916ac..f809efd41e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -272,6 +272,7 @@ ges/Makefile
 tests/Makefile
 tests/check/Makefile
 tests/examples/Makefile
+tools/Makefile
 docs/Makefile
 docs/version.entities
 docs/libs/Makefile
diff --git a/tests/examples/Makefile.am b/tests/examples/Makefile.am
index 4bafca7516..8214e62d68 100644
--- a/tests/examples/Makefile.am
+++ b/tests/examples/Makefile.am
@@ -1,6 +1,5 @@
 noinst_PROGRAMS = 	\
 	concatenate	\
-	playlist	\
 	simple1		\
 	test1		\
 	test2		\
diff --git a/tools/Makefile.am b/tools/Makefile.am
new file mode 100644
index 0000000000..0bf0ae3908
--- /dev/null
+++ b/tools/Makefile.am
@@ -0,0 +1,3 @@
+bin_PROGRAMS = ges-launch
+AM_CFLAGS =  -I$(top_srcdir) $(GST_PROFILE_CFLAGS) $(GST_DISCOVERER_CFLAGS) $(GST_CFLAGS)
+LDADD = $(top_builddir)/ges/libges-@GST_MAJORMINOR@.la -lges-@GST_MAJORMINOR@ -lgstdiscoverer-@GST_MAJORMINOR@ $(GST_DISCOVERER_LIBS) $(GST_LIBS) 
diff --git a/tests/examples/playlist.c b/tools/ges-launch.c
similarity index 100%
rename from tests/examples/playlist.c
rename to tools/ges-launch.c