diff --git a/ChangeLog b/ChangeLog
index 4c99f57994..a58d1ecf2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-09-22  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* ext/directfb/dfbvideosink.c: (plugin_init):
+	  Lower rank from SECONDARY to MARGINAL. Plugins in -bad that might
+	  be autoplugged shouldn't trump plugins in -base, -good or -ugly
+	  (in this case ximagesink).
+
+	* sys/glsink/glimagesink.c: (plugin_init):
+	  Set rank to NONE to prevent it from being autoplugged until
+	  errors are handled properly (see #357212).
+
 2006-09-21  Edgard Lima <edgard.lima@indt.org.br>
 
 	* ext/neon/Makefile.am:
diff --git a/ext/directfb/dfbvideosink.c b/ext/directfb/dfbvideosink.c
index e6aa827768..9d1cca1006 100644
--- a/ext/directfb/dfbvideosink.c
+++ b/ext/directfb/dfbvideosink.c
@@ -2382,7 +2382,7 @@ gst_dfbvideosink_get_type (void)
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-  if (!gst_element_register (plugin, "dfbvideosink", GST_RANK_PRIMARY,
+  if (!gst_element_register (plugin, "dfbvideosink", GST_RANK_MARGINAL,
           GST_TYPE_DFBVIDEOSINK))
     return FALSE;
 
diff --git a/sys/glsink/glimagesink.c b/sys/glsink/glimagesink.c
index c62ae8d7ce..ad1cee14a1 100644
--- a/sys/glsink/glimagesink.c
+++ b/sys/glsink/glimagesink.c
@@ -796,7 +796,7 @@ static gboolean
 plugin_init (GstPlugin * plugin)
 {
   if (!gst_element_register (plugin, "glimagesink",
-          GST_RANK_SECONDARY, GST_TYPE_GLIMAGE_SINK))
+          GST_RANK_NONE, GST_TYPE_GLIMAGE_SINK))
     return FALSE;
 
   GST_DEBUG_CATEGORY_INIT (gst_debug_glimage_sink, "glimagesink", 0,