diff --git a/ChangeLog b/ChangeLog
index 909b4d2f0a..9ec90db590 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-07-13  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* docs/plugins/Makefile.am:
+	* docs/plugins/gst-plugins-bad-plugins-docs.sgml:
+	* docs/plugins/gst-plugins-bad-plugins-sections.txt:
+	  add more plugins and elements to docs
+	* gst/gdp/gstgdpdepay.c: (gst_gdp_depay_chain):
+	  fix segfaults due to wrong g_free
+	  add example
+	* gst/gdp/gstgdppay.c:
+	  add example
+
 2006-07-13  Wim Taymans  <wim@fluendo.com>
 
 	* gst/nsf/Makefile.am:
diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index 28ce143554..a94cafe2ba 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -86,6 +86,8 @@ EXAMPLE_CFILES = \
         $(top_srcdir)/ext/directfb/dfb-example.c
 
 EXTRA_HFILES = \
+	$(top_srcdir)/gst/gdp/gstgdpdepay.h \
+	$(top_srcdir)/gst/gdp/gstgdppay.h \
 	$(top_srcdir)/ext/directfb/dfbvideosink.h \
 	$(top_srcdir)/ext/musicbrainz/gsttrm.h
 
diff --git a/docs/plugins/gst-plugins-bad-plugins-docs.sgml b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
index cf409fb029..0063bce337 100644
--- a/docs/plugins/gst-plugins-bad-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
@@ -14,25 +14,31 @@
     <title>gst-plugins-bad Elements</title>
 
     <xi:include href="xml/element-dfbvideosink.xml" />
+    <xi:include href="xml/element-gdppay.xml" />
+    <xi:include href="xml/element-gdpdepay.xml" />
     <xi:include href="xml/element-trm.xml" />
   </chapter>
 
   <chapter>
     <title>gst-plugins-bad Plugins</title>
-
+    <xi:include href="xml/plugin-alsaspdif.xml" />
     <xi:include href="xml/plugin-bz2.xml" />
     <xi:include href="xml/plugin-cdxaparse.xml" />
     <xi:include href="xml/plugin-dfbvideosink.xml" />
     <xi:include href="xml/plugin-faad.xml" />
     <xi:include href="xml/plugin-freeze.xml" />
+    <xi:include href="xml/plugin-gdp.xml" />
     <xi:include href="xml/plugin-glimagesink.xml" />
     <xi:include href="xml/plugin-gsm.xml" />
+    <xi:include href="xml/plugin-h264parse.xml" />
     <xi:include href="xml/plugin-modplug.xml" />
+    <xi:include href="xml/plugin-musepack.xml" />
     <xi:include href="xml/plugin-musicbrainz.xml" />
     <xi:include href="xml/plugin-neon.xml" />
     <xi:include href="xml/plugin-qtdemux.xml" />
     <xi:include href="xml/plugin-sdlvideosink.xml" />
     <xi:include href="xml/plugin-sdl.xml" />
+    <xi:include href="xml/plugin-spectrum.xml" />
     <xi:include href="xml/plugin-speed.xml" />
     <xi:include href="xml/plugin-tta.xml" />
     <xi:include href="xml/plugin-video4linux2.xml" />
diff --git a/docs/plugins/gst-plugins-bad-plugins-sections.txt b/docs/plugins/gst-plugins-bad-plugins-sections.txt
index ed069cab67..1166bd990b 100644
--- a/docs/plugins/gst-plugins-bad-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-bad-plugins-sections.txt
@@ -1,3 +1,19 @@
+<SECTION>
+<FILE>element-gdpdepay</FILE>
+GstGDPDepay
+<TITLE>gdpdepay</TITLE>
+<SUBSECTION Standard>
+GstGDPDepayClass
+</SECTION>
+
+<SECTION>
+<FILE>element-gdppay</FILE>
+GstGDPPay
+<TITLE>gdppay</TITLE>
+<SUBSECTION Standard>
+GstGDPPayClass
+</SECTION>
+
 <SECTION>
 <FILE>element-dfbvideosink</FILE>
 GstDfbVideoSink
diff --git a/gst/gdp/gstgdpdepay.c b/gst/gdp/gstgdpdepay.c
index 3f973b8bd8..21d6c7303b 100644
--- a/gst/gdp/gstgdpdepay.c
+++ b/gst/gdp/gstgdpdepay.c
@@ -26,6 +26,13 @@
  * This element depayloads GStreamer Data Protocol buffers back to deserialized
  * buffers and events.
  * </para>
+ * <para>
+ * <programlisting>
+ * gst-launch -v -m filesrc location=test.gdp ! gdpdepay ! xvimagesink
+ * </programlisting>
+ * This pipeline plays back a serialized video stream as created in the
+ * example for gdppay.
+ * </para>
  * </refsect2>
  */
 
@@ -231,6 +238,7 @@ gst_gdp_depay_chain (GstPad * pad, GstBuffer * buffer)
         payload = gst_adapter_take (this->adapter, this->payload_length);
         memcpy (GST_BUFFER_DATA (buf), payload, this->payload_length);
         g_free (payload);
+        payload = NULL;
 
         gst_buffer_set_caps (buf, this->caps);
         ret = gst_pad_push (this->srcpad, buf);
@@ -250,6 +258,7 @@ gst_gdp_depay_chain (GstPad * pad, GstBuffer * buffer)
         caps = gst_dp_caps_from_packet (GST_DP_HEADER_LENGTH, this->header,
             payload);
         g_free (payload);
+        payload = NULL;
         if (!caps) {
           GST_ELEMENT_ERROR (this, STREAM, DECODE, (NULL),
               ("could not create caps from GDP packet"));
@@ -273,8 +282,10 @@ gst_gdp_depay_chain (GstPad * pad, GstBuffer * buffer)
           payload = gst_adapter_take (this->adapter, this->payload_length);
         event = gst_dp_event_from_packet (GST_DP_HEADER_LENGTH, this->header,
             payload);
-        if (payload)
+        if (payload) {
           g_free (payload);
+          payload = NULL;
+        }
         if (!event) {
           GST_ELEMENT_ERROR (this, STREAM, DECODE, (NULL),
               ("could not create event from GDP packet"));
diff --git a/gst/gdp/gstgdppay.c b/gst/gdp/gstgdppay.c
index e80476e51f..36585a0286 100644
--- a/gst/gdp/gstgdppay.c
+++ b/gst/gdp/gstgdppay.c
@@ -26,6 +26,13 @@
  * This element payloads GStreamer buffers and events using the
  * GStreamer Data Protocol.
  * </para>
+ * <para>
+ * <programlisting>
+ * gst-launch -v -m videotestsrc num-buffers=50 ! gdppay ! filesink location=test.gdp
+ * </programlisting>
+ * This pipeline creates a serialized video stream that can be played back
+ * with the example shown in gdpdepay.
+ * </para>
  * </refsect2>
  */