diff --git a/ChangeLog b/ChangeLog
index f919a029b7..dde1578ec7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-12  Edward Hervey  <edward.hervey@collabora.co.uk>
+
+	* gst-libs/ext/Makefile.am:
+	More fixes for make dist
+
 2008-05-08  Edward Hervey  <edward.hervey@collabora.co.uk>
 
 	* ffmpegrev:
diff --git a/common b/common
index ba3dd2882b..2d9c09df0f 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit ba3dd2882b1611f8115f9664e3b85e1fd956b53d
+Subproject commit 2d9c09df0fe4ad3f570fea9f649cfc6c4511080d
diff --git a/gst-libs/ext/Makefile.am b/gst-libs/ext/Makefile.am
index 744667d46c..cbc8400def 100644
--- a/gst-libs/ext/Makefile.am
+++ b/gst-libs/ext/Makefile.am
@@ -12,6 +12,7 @@ SUBDIRS =
 DIST_SUBDIRS = ffmpeg
 TMP_DIST_DIR=ffmpeg-dist
 DIST_DIR=$(TMP_DIST_DIR)/.ffmpeg/
+EXTRA_DIST=Makefile.am
 
 all-local:
 	cd ffmpeg && $(MAKE)
@@ -20,11 +21,13 @@ clean-local:
 	cd ffmpeg && $(MAKE) clean
 
 dist-clean:
-	rm -rf $(TMP_DIST_DIR) 
+	rm -rf $(TMP_DIST_DIR)
+	rm -rf ffmpeg/
+	rm -f Makefile
 
 distclean: dist-clean
 
-dist-local: dist-clean
+dist-local:
 	svn -r $(FFMPEG_REVISION) co $(FFMPEG_SVN) $(TMP_DIST_DIR)
 	mkdir $(DIST_DIR)
 	pwd
@@ -51,7 +54,8 @@ dist-local: dist-clean
 	rm -rf $(TMP_DIST_DIR)
 
 distdir: dist-local
-	cp -r ffmpeg Makefile* ${distdir}
+	cp -r ffmpeg ${distdir}
+	cp -f Makefile.am Makefile.in ${distdir}
 
 dist: dist-local
 	tar -czf ffmpeg.tar.gz ffmpeg