diff --git a/ChangeLog b/ChangeLog
index 11e7cafa5a..bb0a961489 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,17 @@
+2008-02-12  Sebastian Dröge  <slomo@circular-chaos.org>
+
+	* docs/plugins/gst-plugins-bad-plugins-docs.sgml:
+	* docs/plugins/gst-plugins-bad-plugins-sections.txt:
+	* docs/plugins/inspect/plugin-gio.xml:
+	Remove documentation for the GIO plugin as it was moved to
+	gst-plugins-base. Fixes bug #515964.
+
 2008-02-12  Jan Schmidt  <jan.schmidt@sun.com>
 
 	* ext/xvid/gstxvidenc.c:
 	* gst/vmnc/vmncdec.c:
 	* sys/glsink/glimagesink.c:
 	* sys/glsink/gstgldisplay.c:
-
 	Fix some finalize leaks by chaining up to the parent method.
 
 2008-02-12  Sebastian Dröge  <slomo@circular-chaos.org>
diff --git a/docs/plugins/gst-plugins-bad-plugins-docs.sgml b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
index 90d26c39d9..2656db8e9d 100644
--- a/docs/plugins/gst-plugins-bad-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
@@ -21,10 +21,6 @@
     <xi:include href="xml/element-dvbsrc.xml" />
     <xi:include href="xml/element-dvdspu.xml" />
     <xi:include href="xml/element-festival.xml" />
-    <xi:include href="xml/element-giosink.xml" />
-    <xi:include href="xml/element-giosrc.xml" />
-    <xi:include href="xml/element-giostreamsink.xml" />
-    <xi:include href="xml/element-giostreamsrc.xml" />
     <xi:include href="xml/element-gstrtpbin.xml" />
     <xi:include href="xml/element-gstrtpclient.xml" />
     <xi:include href="xml/element-gstrtpjitterbuffer.xml" />
@@ -81,7 +77,6 @@
     <xi:include href="xml/plugin-flvdemux.xml" />
     <xi:include href="xml/plugin-freeze.xml" />
     <xi:include href="xml/plugin-gdp.xml" />
-    <xi:include href="xml/plugin-gio.xml" />
     <xi:include href="xml/plugin-glimagesink.xml" />
     <xi:include href="xml/plugin-gsm.xml" />
     <xi:include href="xml/plugin-gstinterlace.xml" />
diff --git a/docs/plugins/gst-plugins-bad-plugins-sections.txt b/docs/plugins/gst-plugins-bad-plugins-sections.txt
index f22057ae2a..8ca69553c0 100644
--- a/docs/plugins/gst-plugins-bad-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-bad-plugins-sections.txt
@@ -154,62 +154,6 @@ FESTIVAL_DEFAULT_SERVER_PORT
 FESTIVAL_DEFAULT_TEXT_MODE
 </SECTION>
 
-<SECTION>
-<FILE>element-giosink</FILE>
-<TITLE>giosink</TITLE>
-GstGioSink
-<SUBSECTION Standard>
-GstGioSinkClass
-GST_GIO_SINK
-GST_GIO_SINK_CLASS
-GST_IS_GIO_SINK
-GST_IS_GIO_SINK_CLASS
-GST_TYPE_GIO_SINK
-gst_gio_sink_get_type
-</SECTION>
-
-<SECTION>
-<FILE>element-giosrc</FILE>
-<TITLE>giosrc</TITLE>
-GstGioSrc
-<SUBSECTION Standard>
-GstGioSrcClass
-GST_GIO_SRC
-GST_GIO_SRC_CLASS
-GST_IS_GIO_SRC
-GST_IS_GIO_SRC_CLASS
-GST_TYPE_GIO_SRC
-gst_gio_src_get_type
-</SECTION>
-
-<SECTION>
-<FILE>element-giostreamsink</FILE>
-<TITLE>giostreamsink</TITLE>
-GstGioStreamSink
-<SUBSECTION Standard>
-GstGioStreamSinkClass
-GST_GIO_STREAM_SINK
-GST_GIO_STREAM_SINK_CLASS
-GST_IS_GIO_STREAM_SINK
-GST_IS_GIO_STREAM_SINK_CLASS
-GST_TYPE_GIO_STREAM_SINK
-gst_gio_stream_sink_get_type
-</SECTION>
-
-<SECTION>
-<FILE>element-giostreamsrc</FILE>
-<TITLE>giostreamsrc</TITLE>
-GstGioStreamSrc
-<SUBSECTION Standard>
-GstGioStreamSrcClass
-GST_GIO_STREAM_SRC
-GST_GIO_STREAM_SRC_CLASS
-GST_IS_GIO_STREAM_SRC
-GST_IS_GIO_STREAM_SRC_CLASS
-GST_TYPE_GIO_STREAM_SRC
-gst_gio_stream_src_get_type
-</SECTION>
-
 <SECTION>
 <FILE>element-souphttpsrc</FILE>
 <TITLE>souphttpsrc</TITLE>
diff --git a/docs/plugins/inspect/plugin-gio.xml b/docs/plugins/inspect/plugin-gio.xml
deleted file mode 100644
index 9636d1769f..0000000000
--- a/docs/plugins/inspect/plugin-gio.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<plugin>
-  <name>gio</name>
-  <description>GIO elements</description>
-  <filename>../../ext/gio/.libs/libgstgio.so</filename>
-  <basename>libgstgio.so</basename>
-  <version>0.10.5.1</version>
-  <license>LGPL</license>
-  <source>gst-plugins-bad</source>
-  <package>GStreamer Bad Plug-ins CVS/prerelease</package>
-  <origin>Unknown package origin</origin>
-  <elements>
-    <element>
-      <name>giosink</name>
-      <longname>GIO sink</longname>
-      <class>Sink/File</class>
-      <description>Write to any GIO-supported location</description>
-      <author>René Stadler &lt;mail@renestadler.de&gt;, Sebastian Dröge &lt;slomo@circular-chaos.org&gt;</author>
-      <pads>
-        <caps>
-          <name>sink</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>ANY</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>giosrc</name>
-      <longname>GIO source</longname>
-      <class>Source/File</class>
-      <description>Read from any GIO-supported location</description>
-      <author>René Stadler &lt;mail@renestadler.de&gt;, Sebastian Dröge &lt;slomo@circular-chaos.org&gt;</author>
-      <pads>
-        <caps>
-          <name>src</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>ANY</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>giostreamsink</name>
-      <longname>GIO stream sink</longname>
-      <class>Sink</class>
-      <description>Write to any GIO stream</description>
-      <author>Sebastian Dröge &lt;slomo@circular-chaos.org&gt;</author>
-      <pads>
-        <caps>
-          <name>sink</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>ANY</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>giostreamsrc</name>
-      <longname>GIO stream source</longname>
-      <class>Source</class>
-      <description>Read from any GIO stream</description>
-      <author>Sebastian Dröge &lt;slomo@circular-chaos.org&gt;</author>
-      <pads>
-        <caps>
-          <name>src</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>ANY</details>
-        </caps>
-      </pads>
-    </element>
-  </elements>
-</plugin>
\ No newline at end of file