diff --git a/docs/gst/gstreamer-sections.txt b/docs/gst/gstreamer-sections.txt
index 63ef0a7f64..bf33a18a76 100644
--- a/docs/gst/gstreamer-sections.txt
+++ b/docs/gst/gstreamer-sections.txt
@@ -1190,21 +1190,6 @@ GST_IS_FILESRC
 GST_IS_FILESRC_CLASS
 </SECTION>
 
-<SECTION>
-<FILE>gstdisksrc</FILE>
-<TITLE>GstDiskSrc</TITLE>
-GstDiskSrcFlags
-<SUBSECTION Standard>
-GstDiskSrc
-GstDiskSrcClass
-gst_disksrc_get_type
-GST_TYPE_DISKSRC
-GST_DISKSRC
-GST_DISKSRC_CLASS
-GST_IS_DISKSRC
-GST_IS_DISKSRC_CLASS
-</SECTION>
-
 <SECTION>
 <FILE>gstfakesink</FILE>
 <TITLE>GstFakeSink</TITLE>
diff --git a/docs/gst/gstreamer.hierarchy b/docs/gst/gstreamer.hierarchy
index eae4c26e61..19d4552c38 100644
--- a/docs/gst/gstreamer.hierarchy
+++ b/docs/gst/gstreamer.hierarchy
@@ -11,7 +11,6 @@ GtkObject
         GstFakeSrc
         GstFakeSink
         GstFileSrc
-        GstDiskSrc
         GstHttpSrc
         GstFdSrc
         GstFdSink
diff --git a/docs/manual/Makefile.am b/docs/manual/Makefile.am
index 2e0d17c8dd..3a2390c4d5 100644
--- a/docs/manual/Makefile.am
+++ b/docs/manual/Makefile.am
@@ -1,74 +1,10 @@
 manualname = gstreamer-manual
 htmlname = index.html
 
-sgml_files = gstreamer-manual.sgml \
-	     advanced.sgml \
-	     autoplugging.sgml \
-             bins.sgml \
-             buffers.sgml \
-             components.sgml \
-             quotes.sgml \
-             pads.sgml \
-             connections.sgml \
-             cothreads.sgml \
-             dynamic.sgml \
-             elements.sgml \
-             factories.sgml \
-             goals.sgml \
-             helloworld.sgml \
-             helloworld2.sgml \
-             init.sgml \
-             intro.sgml \
-             motivation.sgml \
-             plugins.sgml \
-             programs.sgml \
-             debugging.sgml \
-             queues.sgml \
-             states.sgml \
-             threads.sgml \
-             typedetection.sgml \
-             utility.sgml \
-             xml.sgml
-
-fig_files =  bin-element.fig \
-	     bin-element-ghost.fig \
-             connected-elements.fig \
-             filter-element-multi.fig \
-             filter-element.fig \
-             hello-world.fig \
-             mime-world.fig \
-             queue.fig \
-             sink-element.fig \
-             src-element.fig \
-             state-diagram.fig \
-             thread.fig
-
-eps_files =  images/bin-element.eps \
-             images/bin-element-ghost.eps \
-             images/connected-elements.eps \
-             images/filter-element-multi.eps \
-             images/filter-element.eps \
-             images/hello-world.eps \
-             images/mime-world.eps \
-             images/queue.eps \
-             images/sink-element.eps \
-             images/src-element.eps \
-             images/state-diagram.eps \
-             images/thread.eps
-
-png_files =  images/bin-element.png \
-             images/bin-element-ghost.png \
-             images/connected-elements.png \
-             images/filter-element-multi.png \
-             images/filter-element.png \
-             images/hello-world.png \
-             images/mime-world.png \
-             images/queue.png \
-             images/sink-element.png \
-             images/src-element.png \
-             images/state-diagram.png \
-             images/thread.png
-
+sgml_files = $(shell echo $(srcdir)/*.sgml)
+fig_files  = $(shell echo $(srcdir)/*.fig)
+eps_files  = $(shell echo $(srcdir)/*.eps)
+png_files  = $(shell echo $(srcdir)/*.png)
 
 EXTRA_DIST = $(sgml_files) $(fig_files)
 
diff --git a/gst/elements/Makefile.am b/gst/elements/Makefile.am
index 5238aacdad..12a9284f35 100644
--- a/gst/elements/Makefile.am
+++ b/gst/elements/Makefile.am
@@ -14,7 +14,6 @@ libgstelements_la_SOURCES =	\
 	gstfakesrc.c		\
 	gstidentity.c		\
 	gstfakesink.c		\
-	gstdisksrc.c		\
 	gstfilesrc.c		\
 	gstdisksink.c		\
 	gstfdsrc.c		\
@@ -30,7 +29,6 @@ noinst_HEADERS =		\
 	gstfakesrc.h		\
 	gstidentity.h		\
 	gstfakesink.h		\
-	gstdisksrc.h		\
 	gstdisksink.h		\
 	gstfdsrc.h		\
 	gstmultidisksrc.h	\
diff --git a/plugins/elements/Makefile.am b/plugins/elements/Makefile.am
index 5238aacdad..12a9284f35 100644
--- a/plugins/elements/Makefile.am
+++ b/plugins/elements/Makefile.am
@@ -14,7 +14,6 @@ libgstelements_la_SOURCES =	\
 	gstfakesrc.c		\
 	gstidentity.c		\
 	gstfakesink.c		\
-	gstdisksrc.c		\
 	gstfilesrc.c		\
 	gstdisksink.c		\
 	gstfdsrc.c		\
@@ -30,7 +29,6 @@ noinst_HEADERS =		\
 	gstfakesrc.h		\
 	gstidentity.h		\
 	gstfakesink.h		\
-	gstdisksrc.h		\
 	gstdisksink.h		\
 	gstfdsrc.h		\
 	gstmultidisksrc.h	\