diff --git a/ChangeLog b/ChangeLog
index 3ee968eb9f..79d96e50b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-20  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* docs/plugins/Makefile.am:
+	* docs/plugins/gst-plugins-bad-plugins.hierarchy:
+	  Fix docs build and hierarchy.
+
 2007-05-20  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* sys/directdraw/gstdirectdrawsink.c: (gst_ddrawsurface_finalize),
diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index 2c150ede3e..ac24fec2e2 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -89,6 +89,9 @@ EXAMPLE_CFILES = \
         $(top_srcdir)/ext/directfb/dfb-example.c
 
 EXTRA_HFILES = \
+	$(top_srcdir)/sys/directdraw/gstdirectdrawsink.h \
+	$(top_srcdir)/sys/directsound/gstdirectsoundsink.h \
+	$(top_srcdir)/sys/waveform/gstwaveformsink.h \
 	$(top_srcdir)/ext/directfb/dfbvideosink.h \
 	$(top_srcdir)/ext/jack/gstjackaudiosink.h \
 	$(top_srcdir)/ext/musicbrainz/gsttrm.h \
diff --git a/docs/plugins/gst-plugins-bad-plugins.hierarchy b/docs/plugins/gst-plugins-bad-plugins.hierarchy
index 4970f40e4e..ea985daa18 100644
--- a/docs/plugins/gst-plugins-bad-plugins.hierarchy
+++ b/docs/plugins/gst-plugins-bad-plugins.hierarchy
@@ -12,12 +12,12 @@ GObject
         GstBaseAudioSink
           GstJackAudioSink
           GstAudioSink
-			GstDirectSoundSink
-            GstSDLAudioSink
-			GstWaveFormSink
+          GstDirectSoundSink
+          GstSDLAudioSink
+          GstWaveFormSink
         GstVideoSink
           GstDirectDrawSink
-		  GstGLImageSink
+          GstGLImageSink
           GstSDLVideoSink
           GstDfbVideoSink
           GstOSXVideoSink