diff --git a/ChangeLog b/ChangeLog
index 396c913711..7f7a2f1c5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-07-12  Andy Wingo  <wingo@pobox.com>
 
+	* configure.ac (AC_CONFIG_FILES):
+	* examples/: Moved all examples up from examples/gst/ into
+	examples/.
+
 	* examples/gstplay: Removed examples for old gstplay.
 
 2005-07-12  Edward Hervey  <edward@fluendo.com>
diff --git a/configure.ac b/configure.ac
index 30efc54926..d1b26a4b07 100644
--- a/configure.ac
+++ b/configure.ac
@@ -165,7 +165,6 @@ changequote([,])dnl
 AC_OUTPUT([
   Makefile
   examples/Makefile
-  examples/gst/Makefile
   gst/Makefile
   pkgconfig/Makefile
   pkgconfig/gst-python.pc
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 062cb55aab..bb81a9e0a4 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1 +1,13 @@
-SUBDIRS = gst
+examplesdir = $(pkgdatadir)/examples
+examples_DATA = 	\
+	bps.py		\
+	cp.py		\
+	f2f.py		\
+	filesrc.py	\
+	gst123		\
+	play.py		\
+	vorbisplay.py	\
+	gstfile.py	\
+	audioconcat.py
+
+EXTRA_DIST = $(examples_DATA)
diff --git a/examples/gst/audioconcat.py b/examples/audioconcat.py
similarity index 100%
rename from examples/gst/audioconcat.py
rename to examples/audioconcat.py
diff --git a/examples/gst/bps.py b/examples/bps.py
similarity index 100%
rename from examples/gst/bps.py
rename to examples/bps.py
diff --git a/examples/gst/cp.py b/examples/cp.py
similarity index 100%
rename from examples/gst/cp.py
rename to examples/cp.py
diff --git a/examples/gst/f2f.py b/examples/f2f.py
similarity index 100%
rename from examples/gst/f2f.py
rename to examples/f2f.py
diff --git a/examples/gst/filesrc.py b/examples/filesrc.py
similarity index 100%
rename from examples/gst/filesrc.py
rename to examples/filesrc.py
diff --git a/examples/gst/.gitignore b/examples/gst/.gitignore
deleted file mode 100644
index f25164d724..0000000000
--- a/examples/gst/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile.in
-Makefile
-*.pyc
-*.pyo
-*.swp
diff --git a/examples/gst/Makefile.am b/examples/gst/Makefile.am
deleted file mode 100644
index bb81a9e0a4..0000000000
--- a/examples/gst/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-examplesdir = $(pkgdatadir)/examples
-examples_DATA = 	\
-	bps.py		\
-	cp.py		\
-	f2f.py		\
-	filesrc.py	\
-	gst123		\
-	play.py		\
-	vorbisplay.py	\
-	gstfile.py	\
-	audioconcat.py
-
-EXTRA_DIST = $(examples_DATA)
diff --git a/examples/gst/gst123 b/examples/gst123
similarity index 100%
rename from examples/gst/gst123
rename to examples/gst123
diff --git a/examples/gst/gstfile.py b/examples/gstfile.py
similarity index 100%
rename from examples/gst/gstfile.py
rename to examples/gstfile.py
diff --git a/examples/gst/play.py b/examples/play.py
similarity index 100%
rename from examples/gst/play.py
rename to examples/play.py
diff --git a/examples/gst/vorbisplay.py b/examples/vorbisplay.py
similarity index 100%
rename from examples/gst/vorbisplay.py
rename to examples/vorbisplay.py