diff --git a/packages/graphics/Mesa/patches/105_glXWaitX-segfaults.diff b/packages/graphics/Mesa/patches/105_glXWaitX-segfaults.diff
deleted file mode 100644
index 985c5dd3c7..0000000000
--- a/packages/graphics/Mesa/patches/105_glXWaitX-segfaults.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- Mesa-7.4/src/glx/x11/drisw_glx.c	2009-01-22 17:38:33.000000000 +0000
-+++ Mesa-7.4/src/glx/x11/drisw_glx.c.fixed	2009-04-03 23:25:17.000000000 +0100
-@@ -405,6 +405,8 @@
-    psp->createContext = driCreateContext;
-    psp->createDrawable = driCreateDrawable;
-    psp->swapBuffers = driSwapBuffers;
-+   psp->waitX = NULL;
-+   psp->waitGL = NULL;
- 
-    return psp;
- 
diff --git a/packages/graphics/Mesa/url b/packages/graphics/Mesa/url
index 0d2971616a..bc973edf50 100644
--- a/packages/graphics/Mesa/url
+++ b/packages/graphics/Mesa/url
@@ -1,2 +1,2 @@
-http://www.mesa3d.org/beta/MesaLib-7.5-rc2.tar.gz
-http://mesa3d.org/beta/MesaDemos-7.5-rc2.tar.gz
\ No newline at end of file
+http://www.mesa3d.org/beta/MesaLib-7.5-rc3.tar.gz
+http://mesa3d.org/beta/MesaDemos-7.5-rc3.tar.gz
diff --git a/packages/multimedia/gst-ffmpeg/build b/packages/multimedia/gst-ffmpeg/build
index 6d50cfc3c7..a59f95ae64 100755
--- a/packages/multimedia/gst-ffmpeg/build
+++ b/packages/multimedia/gst-ffmpeg/build
@@ -4,7 +4,7 @@
 
 $SCRIPTS/build toolchain
 $SCRIPTS/build liboil
-#$SCRIPTS/build ffmpeg
+$SCRIPTS/build ffmpeg
 $SCRIPTS/build bzip2
 $SCRIPTS/build gstreamer
 
@@ -25,7 +25,7 @@ cd $PKG_BUILD
             --disable-static \
             --enable-shared \
             --disable-nls \
-#            --with-system-ffmpeg \
+            --with-system-ffmpeg \
 
 make
 
diff --git a/packages/multimedia/gst-ffmpeg/install b/packages/multimedia/gst-ffmpeg/install
index 0d55df3078..272ad9c5fc 100755
--- a/packages/multimedia/gst-ffmpeg/install
+++ b/packages/multimedia/gst-ffmpeg/install
@@ -5,7 +5,7 @@
 $SCRIPTS/install gstreamer
 #$SCRIPTS/install liboil
 #$SCRIPTS/install bzip2
-#$SCRIPTS/install ffmpeg
+$SCRIPTS/install ffmpeg
 
 PLUGINS_EXT="ffmpeg libpostproc libswscale"
 
diff --git a/packages/multimedia/gst-ffmpeg/url b/packages/multimedia/gst-ffmpeg/url
index 55bd62abed..35d9b01ea2 100644
--- a/packages/multimedia/gst-ffmpeg/url
+++ b/packages/multimedia/gst-ffmpeg/url
@@ -1 +1 @@
-http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.6.tar.bz2
+http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.7.tar.bz2
diff --git a/packages/virtual/image/install b/packages/virtual/image/install
index e8f04a9d7c..257ed8e3dd 100755
--- a/packages/virtual/image/install
+++ b/packages/virtual/image/install
@@ -56,7 +56,7 @@ case "$2" in
     $SCRIPTS/install gst-plugins-good
     $SCRIPTS/install gst-plugins-bad
     $SCRIPTS/install gst-plugins-ugly
-    $SCRIPTS/install gst-ffmpeg
+#    $SCRIPTS/install gst-ffmpeg
     $SCRIPTS/install gnome-dvb-daemon
 
 #    if [ "$BOOTCHART" = yes ]; then