diff --git a/ChangeLog b/ChangeLog
index b3f266de53..914a891785 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-04-14  Andy Wingo  <wingo@pobox.com>
+
+	* autogen.sh:
+	* ffmpegrev (FFMPEG_EXTERNALS_UPDATE): Because ffmpeg checks out
+	libswscale via an svn:externals, checking out an old ffmpeg does
+	not check out a corresponding libswscale. Keep the swscale
+	checkout manually synchronized, then. Update this when you update
+	FFMPEG_REVISION.
+
 2008-04-06  Sebastian Dröge  <slomo@circular-chaos.org>
 
         Patch by: Damien Lespiau <damien dot lespiau at gmail dot com>
diff --git a/autogen.sh b/autogen.sh
index dd07d008e3..8741891f8a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -22,10 +22,14 @@ then
 	rm -rf $FFMPEG_CO_DIR
 	echo "+ getting ffmpeg from svn"
 	svn -r $FFMPEG_REVISION co $FFMPEG_SVN $FFMPEG_CO_DIR
+	echo "+ updating externals"
+        sh -c "$FFMPEG_EXTERNALS_UPDATE"
 else
     # update ffmpeg from its repository
     echo "+ updating ffmpeg checkout"
     svn -r $FFMPEG_REVISION up $FFMPEG_CO_DIR
+    echo "+ updating externals"
+    sh -c "$FFMPEG_EXTERNALS_UPDATE"
 fi
 
 
diff --git a/common b/common
index fda6da5f2b..f88ff852da 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit fda6da5f2b9b000f7e1df8ffb44a6185ffd9799b
+Subproject commit f88ff852da7631ad2d0be835763da6d551a63883
diff --git a/ffmpegrev b/ffmpegrev
index 0883244283..d967187668 100644
--- a/ffmpegrev
+++ b/ffmpegrev
@@ -2,3 +2,8 @@
 FFMPEG_REVISION=12672
 FFMPEG_CO_DIR=gst-libs/ext/ffmpeg
 FFMPEG_SVN=svn://svn.mplayerhq.hu/ffmpeg/trunk
+# Because ffmpeg checks out libswscale via an svn:externals, checking
+# out an old ffmpeg does not check out a corresponding libswscale.
+# Keep the swscale checkout manually synchronized, then. Update this
+# when you update FFMPEG_REVISION.
+FFMPEG_EXTERNALS_UPDATE="cd $FFMPEG_CO_DIR/libswscale && svn up -r '{2008-04-03 00:07:21 +0200}'"