diff --git a/gst-libs/Makefile.am b/gst-libs/Makefile.am
index c77dc62153..3483c609bd 100644
--- a/gst-libs/Makefile.am
+++ b/gst-libs/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = gst ext
+
+DIST_SUBDIRS= gst ext
diff --git a/gst-libs/ext/Makefile.am b/gst-libs/ext/Makefile.am
index d25e019c58..7271132c62 100644
--- a/gst-libs/ext/Makefile.am
+++ b/gst-libs/ext/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = ffmpeg mplex
+
+DIST_SUBDIRS= ffmpeg mplex
diff --git a/gst-plugins.spec.in b/gst-plugins.spec.in
index fb83f7cf2b..619086e0b8 100644
--- a/gst-plugins.spec.in
+++ b/gst-plugins.spec.in
@@ -254,6 +254,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libgstmedia-info*.so.0.0.0
 %{_libdir}/gstreamer-%{majorminor}/libgstsmoothwave.so
 %{_libdir}/gstreamer-%{majorminor}/libgsttcp.so
 %{_libdir}/gstreamer-%{majorminor}/libgsttextoverlay.so
+%{_libdir}/gstreamer-%{majorminor}/libgstffmpeg.so
 
 # non-core plugins with external dependencies
 @USE_ARTS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstarts.so
@@ -694,6 +695,8 @@ Plug-ins for playback of AVI format media files.
 @USE_MAD_TRUE@Requires:      gstreamer-plugins = %{version}
 @USE_MAD_TRUE@Requires:      libmad >= 0.13.0
 @USE_MAD_TRUE@BuildRequires: libmad-devel >= 0.13.0
+@USE_MAD_TRUE@Requires:	     libid3tag >= 0.15.0
+@USE_MAD_TRUE@BuildRequires: libid3tag-devel => 0.15.0
 @USE_MAD_TRUE@
 @USE_MAD_TRUE@%description -n gstreamer-mad
 @USE_MAD_TRUE@Plug-in for playback of mp3 songs using the very good MAD library.
diff --git a/m4/as-slurp-ffmpeg.m4 b/m4/as-slurp-ffmpeg.m4
index 625eccd2ac..8fbb8835d5 100644
--- a/m4/as-slurp-ffmpeg.m4
+++ b/m4/as-slurp-ffmpeg.m4
@@ -24,7 +24,7 @@ AC_DEFUN(AS_SLURP_FFMPEG,
   if test ! -d $1; then mkdir -p $1; fi
   cd $1
 
-  if test ! -d ffmpeg/CVS; then
+  if test ! -e ffmpeg/README; then
     # check out cvs code
     AC_MSG_NOTICE(checking out ffmpeg cvs code from $2 into $1)
     cvs -Q -d:pserver:anonymous@cvs.ffmpeg.sourceforge.net:/cvsroot/ffmpeg co -D '$2' ffmpeg || FAILED=yes