diff --git a/ChangeLog b/ChangeLog
index a95c7e82c2..0554cae180 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-05-16  Jan Schmidt  <jan.schmidt@sun.com>
+
+	* docs/Makefile.am:
+	Don't attempt to build plugin docs when they're disabled.
+
+	* gst/bayer/Makefile.am:
+	Add libgstvideo to the link.
+
+	* gst/rtpmanager/Makefile.am:
+	Fix link order, and move LIBS things to _LIBS
+
 2008-05-16  Jan Schmidt  <jan.schmidt@sun.com>
 
 	* docs/plugins/gst-plugins-bad-plugins.types:
diff --git a/common b/common
index 0823ac6b46..3b3631082d 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 0823ac6b46b7332109bbc5f1ef40e24e648fae51
+Subproject commit 3b3631082d04b426f450810e8836de94e9c5d60a
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 2b9075b79d..762d93b20f 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,5 +1,11 @@
+if ENABLE_PLUGIN_DOCS
+PLUGIN_DOCS_DIRS = plugins
+else
+PLUGIN_DOCS_DIRS =
+endif
+
 if ENABLE_GTK_DOC
-GTK_DOC_DIRS = plugins
+GTK_DOC_DIRS = $(PLUGINS_DOCS_DIRS)
 else
 GTK_DOC_DIRS =
 endif
diff --git a/gst/bayer/Makefile.am b/gst/bayer/Makefile.am
index b4001502cf..4f1784062f 100644
--- a/gst/bayer/Makefile.am
+++ b/gst/bayer/Makefile.am
@@ -1,7 +1,9 @@
 plugin_LTLIBRARIES = libgstbayer.la
 
 libgstbayer_la_SOURCES = gstbayer.c gstbayer2rgb.c
-libgstbayer_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
-libgstbayer_la_LIBADD = $(GST_BASE_LIBS)
+libgstbayer_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
+    $(GST_CFLAGS)
+libgstbayer_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
+    $(GST_BASE_LIBS)
 libgstbayer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
diff --git a/gst/rtpmanager/Makefile.am b/gst/rtpmanager/Makefile.am
index cad27a366f..8f214de734 100644
--- a/gst/rtpmanager/Makefile.am
+++ b/gst/rtpmanager/Makefile.am
@@ -36,10 +36,12 @@ noinst_HEADERS = gstrtpbin.h \
 		 rtpstats.h  \
 		 gstrtpsession.h
 
-libgstrtpmanager_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(ERROR_CFLAGS)
-libgstrtpmanager_la_LIBADD = $(GST_LIBS_LIBS)
-libgstrtpmanager_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_MAJORMINOR@ \
-			      -lgstnetbuffer-@GST_MAJORMINOR@
+libgstrtpmanager_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
+	$(ERROR_CFLAGS)
+libgstrtpmanager_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
+	-lgstnetbuffer-@GST_MAJORMINOR@ -lgstrtp-@GST_MAJORMINOR@ \
+	$(GST_BASE_LIBS) $(GST_LIBS_LIBS)
+libgstrtpmanager_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 CLEANFILES = $(BUILT_SOURCES)