diff --git a/ChangeLog b/ChangeLog
index c3c2c1bbad..9bb2a20fcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-14  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* examples/sinkelement-registry.py:
+	A quick modification of the sinkelement.py example that
+	shows how to register a pure-python gst.Element into the 
+	registry for use in autoplugging or parse_launch lines.
+
 2007-06-12  Edward Hervey  <edward@fluendo.com>
 
 	* gst/__init__.py:
diff --git a/examples/sinkelement-registry.py b/examples/sinkelement-registry.py
new file mode 100644
index 0000000000..8131acd68f
--- /dev/null
+++ b/examples/sinkelement-registry.py
@@ -0,0 +1,69 @@
+#!/usr/bin/env python
+# -*- Mode: Python -*-
+# vi:si:et:sw=4:sts=4:ts=4
+
+# sinkelement.py
+# (c) 2005 Edward Hervey <edward@fluendo.com>
+# (c) 2007 Jan Schmidt <jan@fluendo.com>
+# Licensed under LGPL
+#
+# Small test application to show how to write a sink element
+# in 20 lines in python and place into the gstreamer registry
+# so it can be autoplugged or used from parse_launch.
+#
+# Run this script with GST_DEBUG=python:5 to see the debug
+# messages
+
+import pygst
+pygst.require('0.10')
+import gst
+import gobject
+gobject.threads_init ()
+
+#
+# Simple Sink element created entirely in python
+#
+
+class MySink(gst.Element):
+    __gstdetails__ = ('CustomSink','Sink', \
+                      'Custom test sink element', 'Edward Hervey')
+
+    _sinkpadtemplate = gst.PadTemplate ("sinkpadtemplate",
+                                        gst.PAD_SINK,
+                                        gst.PAD_ALWAYS,
+                                        gst.caps_new_any())
+
+    def __init__(self):
+        gst.Element.__init__(self)
+        gst.info('creating sinkpad')
+        self.sinkpad = gst.Pad(self._sinkpadtemplate, "sink")
+        gst.info('adding sinkpad to self')
+        self.add_pad(self.sinkpad)
+
+        gst.info('setting chain/event functions')
+        self.sinkpad.set_chain_function(self.chainfunc)
+        self.sinkpad.set_event_function(self.eventfunc)
+        
+    def chainfunc(self, pad, buffer):
+        self.info("%s timestamp(buffer):%d" % (pad, buffer.timestamp))
+        return gst.FLOW_OK
+
+    def eventfunc(self, pad, event):
+        self.info("%s event:%r" % (pad, event.type))
+        return True
+
+gobject.type_register(MySink)
+
+# Register the element into this process' registry.
+gst.element_register (MySink, 'mysink', gst.RANK_MARGINAL)
+
+print "Use --gst-debug=python:3 to see output from this example"
+
+#
+# Code to test the MySink class
+#
+gst.info('About to create MySink')
+pipeline = gst.parse_launch ("fakesrc ! mysink")
+pipeline.set_state(gst.STATE_PLAYING)
+
+gobject.MainLoop().run()