diff --git a/configure.ac b/configure.ac
index 427b535445..d59b4526a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1526,6 +1526,7 @@ examples/dynparams/Makefile
 examples/capsfilter/Makefile
 examples/seeking/Makefile
 examples/indexing/Makefile
+examples/gstplay/Makefile
 examples/Makefile
 testsuite/spider/Makefile
 testsuite/alsa/Makefile
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 6c582d9e57..8c10c89eaf 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -10,5 +10,5 @@ else
 GTK_SUBDIRS=
 endif
 
-SUBDIRS=$(GTK_SUBDIRS)
-DIST_SUBDIRS=capsfilter dynparams seeking indexing
+SUBDIRS=$(GTK_SUBDIRS) gstplay
+DIST_SUBDIRS=capsfilter dynparams seeking indexing gstplay
diff --git a/examples/gstplay/Makefile.am b/examples/gstplay/Makefile.am
new file mode 100644
index 0000000000..7316c44387
--- /dev/null
+++ b/examples/gstplay/Makefile.am
@@ -0,0 +1,7 @@
+
+noinst_PROGRAMS = player
+
+player_SOURCES = player.c
+player_LDFLAGS = \
+    $(GST_LIBS) \
+    $(top_builddir)/gst-libs/gst/play/libgstplay-@GST_MAJORMINOR@.la
diff --git a/examples/gstplay/player.c b/examples/gstplay/player.c
new file mode 100644
index 0000000000..7e07c61120
--- /dev/null
+++ b/examples/gstplay/player.c
@@ -0,0 +1,119 @@
+/* GStreamer
+ * Copyright (C) 2003 Julien Moutte <julien@moutte.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+ 
+#include <gst/play/gstplay.h>
+
+static GMainLoop *loop = NULL;
+
+static void
+got_time_tick (GstPlay *play, gint64 time_nanos)
+{
+  g_message ("time tick %llu", time_nanos);
+}
+
+static void
+got_stream_length (GstPlay *play, gint64 length_nanos)
+{
+  g_message ("got length %llu", length_nanos);
+}
+
+static void
+got_video_size (GstPlay *play, gint width, gint height)
+{
+  g_message ("got video size %d, %d", width, height);
+}
+
+static void
+got_eos (GstPlay *play)
+{
+  g_main_loop_quit (loop);
+}
+
+static gboolean
+seek_timer (GstPlay *play)
+{
+  gst_play_seek_to_time (play, 163439850000LL);
+  return FALSE;
+}
+
+static gboolean
+idle_iterate (GstPlay *play)
+{
+  gst_bin_iterate (GST_BIN (play));
+  return (GST_STATE (GST_ELEMENT (play)) == GST_STATE_PLAYING);
+}
+
+int
+main (int argc, char *argv[])
+{
+  GstPlay *play;
+  GstElement *data_src, *video_sink, *audio_sink, *vis_element;
+
+  /* Initing GStreamer library */
+  gst_init (&argc, &argv);
+
+  if (argc != 2) {
+    g_print ("usage: %s <video filename>\n", argv[0]);
+    exit (-1);
+  }
+  
+  loop = g_main_loop_new (NULL, FALSE);
+
+  /* Creating the GstPlay object */
+  play = gst_play_new ();
+
+  /* Getting default audio and video plugins from GConf */
+  audio_sink = gst_element_factory_make ("osssink", "audio_sink");
+  video_sink = gst_element_factory_make ("ximagesink", "video_sink");
+  vis_element = gst_element_factory_make ("goom", "vis_element");
+  data_src = gst_element_factory_make ("gnomevfssrc", "source");
+  
+  /* Let's send them to GstPlay object */
+  gst_play_set_audio_sink (play, audio_sink);
+  gst_play_set_video_sink (play, video_sink);
+  gst_play_set_data_src (play, data_src);
+  gst_play_set_visualization (play, vis_element);
+  
+  /* Setting location we want to play */
+  gst_play_set_location (play, argv[1]);
+
+  /* gst_xml_write_file (GST_ELEMENT (play), stdout); */
+  
+  g_signal_connect (G_OBJECT (play), "time_tick",
+                    G_CALLBACK (got_time_tick), NULL);
+  g_signal_connect (G_OBJECT (play), "stream_length",
+                    G_CALLBACK (got_stream_length), NULL);
+  g_signal_connect (G_OBJECT (play), "have_video_size",
+                    G_CALLBACK (got_video_size), NULL);
+  g_signal_connect (G_OBJECT (play), "eos",
+                    G_CALLBACK (got_eos), NULL);
+  
+  /* Change state to PLAYING */
+  gst_element_set_state (GST_ELEMENT (play), GST_STATE_PLAYING);
+
+  g_idle_add ((GSourceFunc) idle_iterate, play);
+  g_timeout_add (20000, (GSourceFunc) seek_timer, play);
+  
+  g_main_loop_run (loop);
+
+  /* unref */
+  gst_object_unref (GST_OBJECT (play));
+
+  exit (0);
+}
diff --git a/tests/old/examples/Makefile.am b/tests/old/examples/Makefile.am
index 6c582d9e57..8c10c89eaf 100644
--- a/tests/old/examples/Makefile.am
+++ b/tests/old/examples/Makefile.am
@@ -10,5 +10,5 @@ else
 GTK_SUBDIRS=
 endif
 
-SUBDIRS=$(GTK_SUBDIRS)
-DIST_SUBDIRS=capsfilter dynparams seeking indexing
+SUBDIRS=$(GTK_SUBDIRS) gstplay
+DIST_SUBDIRS=capsfilter dynparams seeking indexing gstplay
diff --git a/tests/old/examples/gstplay/Makefile.am b/tests/old/examples/gstplay/Makefile.am
new file mode 100644
index 0000000000..7316c44387
--- /dev/null
+++ b/tests/old/examples/gstplay/Makefile.am
@@ -0,0 +1,7 @@
+
+noinst_PROGRAMS = player
+
+player_SOURCES = player.c
+player_LDFLAGS = \
+    $(GST_LIBS) \
+    $(top_builddir)/gst-libs/gst/play/libgstplay-@GST_MAJORMINOR@.la
diff --git a/tests/old/examples/gstplay/player.c b/tests/old/examples/gstplay/player.c
new file mode 100644
index 0000000000..7e07c61120
--- /dev/null
+++ b/tests/old/examples/gstplay/player.c
@@ -0,0 +1,119 @@
+/* GStreamer
+ * Copyright (C) 2003 Julien Moutte <julien@moutte.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+ 
+#include <gst/play/gstplay.h>
+
+static GMainLoop *loop = NULL;
+
+static void
+got_time_tick (GstPlay *play, gint64 time_nanos)
+{
+  g_message ("time tick %llu", time_nanos);
+}
+
+static void
+got_stream_length (GstPlay *play, gint64 length_nanos)
+{
+  g_message ("got length %llu", length_nanos);
+}
+
+static void
+got_video_size (GstPlay *play, gint width, gint height)
+{
+  g_message ("got video size %d, %d", width, height);
+}
+
+static void
+got_eos (GstPlay *play)
+{
+  g_main_loop_quit (loop);
+}
+
+static gboolean
+seek_timer (GstPlay *play)
+{
+  gst_play_seek_to_time (play, 163439850000LL);
+  return FALSE;
+}
+
+static gboolean
+idle_iterate (GstPlay *play)
+{
+  gst_bin_iterate (GST_BIN (play));
+  return (GST_STATE (GST_ELEMENT (play)) == GST_STATE_PLAYING);
+}
+
+int
+main (int argc, char *argv[])
+{
+  GstPlay *play;
+  GstElement *data_src, *video_sink, *audio_sink, *vis_element;
+
+  /* Initing GStreamer library */
+  gst_init (&argc, &argv);
+
+  if (argc != 2) {
+    g_print ("usage: %s <video filename>\n", argv[0]);
+    exit (-1);
+  }
+  
+  loop = g_main_loop_new (NULL, FALSE);
+
+  /* Creating the GstPlay object */
+  play = gst_play_new ();
+
+  /* Getting default audio and video plugins from GConf */
+  audio_sink = gst_element_factory_make ("osssink", "audio_sink");
+  video_sink = gst_element_factory_make ("ximagesink", "video_sink");
+  vis_element = gst_element_factory_make ("goom", "vis_element");
+  data_src = gst_element_factory_make ("gnomevfssrc", "source");
+  
+  /* Let's send them to GstPlay object */
+  gst_play_set_audio_sink (play, audio_sink);
+  gst_play_set_video_sink (play, video_sink);
+  gst_play_set_data_src (play, data_src);
+  gst_play_set_visualization (play, vis_element);
+  
+  /* Setting location we want to play */
+  gst_play_set_location (play, argv[1]);
+
+  /* gst_xml_write_file (GST_ELEMENT (play), stdout); */
+  
+  g_signal_connect (G_OBJECT (play), "time_tick",
+                    G_CALLBACK (got_time_tick), NULL);
+  g_signal_connect (G_OBJECT (play), "stream_length",
+                    G_CALLBACK (got_stream_length), NULL);
+  g_signal_connect (G_OBJECT (play), "have_video_size",
+                    G_CALLBACK (got_video_size), NULL);
+  g_signal_connect (G_OBJECT (play), "eos",
+                    G_CALLBACK (got_eos), NULL);
+  
+  /* Change state to PLAYING */
+  gst_element_set_state (GST_ELEMENT (play), GST_STATE_PLAYING);
+
+  g_idle_add ((GSourceFunc) idle_iterate, play);
+  g_timeout_add (20000, (GSourceFunc) seek_timer, play);
+  
+  g_main_loop_run (loop);
+
+  /* unref */
+  gst_object_unref (GST_OBJECT (play));
+
+  exit (0);
+}