diff --git a/common b/common
index f0da7b89be..bca2dfba7b 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit f0da7b89bea3eb2ed1d149166f28afa5e670dec2
+Subproject commit bca2dfba7bfc36020b5ba26b640ebde4cc76a5f0
diff --git a/gconf/gstreamer.schemas b/gconf/gstreamer.schemas
index b784bf6edf..cf050908f1 100644
--- a/gconf/gstreamer.schemas
+++ b/gconf/gstreamer.schemas
@@ -16,10 +16,10 @@
         <applyto>/system/gstreamer/default/videosink</applyto>
         <owner>gstreamer</owner>
         <type>string</type>
-        <default>videosink</default>
+        <default>xvideosink</default>
         <locale name="C">
         <short>default GStreamer videosink</short>
-        <long>GStreamer can play video using any number of output plugins.  Some possible choices are videosink, sdlvideosink and aasink.</long>
+        <long>GStreamer can play video using any number of output plugins.  Some possible choices are xvideosink, sdlvideosink and aasink.</long>
         </locale>
       </schema>
     </schemalist>