diff --git a/configure.ac b/configure.ac
index 35f4418131..065298facb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,11 @@ dnl we override it here if we need to for the release candidate of new series
 GST_MAJORMINOR=0.10
 AC_SUBST(GST_MAJORMINOR)
 
-AS_LIBTOOL_TAGS
+dnl FIXME: this macro doesn't actually work;
+dnl the generated libtool script has no support for the listed tags.
+dnl So this needs to be fixed first if we want to use this
+dnl AS_LIBTOOL_TAGS
+
 AM_PROG_LIBTOOL
 
 dnl *** required versions of GStreamer stuff ***
diff --git a/docs/plugins/gst-plugins-good-plugins-docs.sgml b/docs/plugins/gst-plugins-good-plugins-docs.sgml
index 1975fa0b51..b4b85e185b 100644
--- a/docs/plugins/gst-plugins-good-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-good-plugins-docs.sgml
@@ -66,6 +66,7 @@
     <xi:include href="xml/plugin-halelements.xml" />
     <xi:include href="xml/plugin-id3demux.xml" />
     <xi:include href="xml/plugin-jpeg.xml" />
+    <xi:include href="xml/plugin-ladspa.xml" />
     <xi:include href="xml/plugin-level.xml" />
     <xi:include href="xml/plugin-matroska.xml" />
     <xi:include href="xml/plugin-mulaw.xml" />
diff --git a/docs/upload.mak b/docs/upload.mak
index 90a86d7aa0..cff4c49b33 100644
--- a/docs/upload.mak
+++ b/docs/upload.mak
@@ -13,7 +13,7 @@
 # correct User entry for the Host entry for the DOC_SERVER
 
 # these variables define the location of the online docs
-DOC_SERVER=freedesktop.org
+DOC_SERVER=gstreamer.freedesktop.org
 DOC_BASE=/srv/gstreamer.freedesktop.org/www/data/doc
 DOC_URL=$(DOC_SERVER):$(DOC_BASE)
 GST_VERSION_NANO = $(GST_PLUGINS_GOOD_VERSION_NANO)