diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 45e8b6b29c..76e1d3f550 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -856,10 +856,8 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 ffmpeg:
 	echo $(FFMPEG_CVSROOT) A > ./ffmpeg.cvs
 	CVS_PASSFILE=./ffmpeg.cvs cvs -z3 -d $(FFMPEG_CVSROOT) co ffmpeg
-	(cd $@;patch -p 0 <../Patches/ffmpeg-cvs.patch) 
 ifeq ($(HOST),i586-pc-beos)
-	patch -p 0 < Patches/ffmpeg-beos.patch.cvs
-	(cd $@; ./bootstrap)
+	(cd $@; patch -p 0 < ../Patches/ffmpeg-cvs-beos.patch)
 endif
 ifdef HAVE_WIN32
 	patch -p 0 < Patches/ffmpeg-cvs-win32.patch
@@ -887,7 +885,7 @@ ifdef HAVE_WINCE
 else
 .ffmpeg: ffmpeg .faac .lame
 endif
-	(cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-pp --disable-vhook --disable-ffserver --disable-network --enable-a52 --disable-ffplay && for dir in libavcodec/libpostproc libavcodec libavformat libavutil; do make -C $$dir && make -C $$dir installlib; done)
+	(cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-pp --disable-vhook --disable-ffserver --disable-network --enable-a52 --disable-ffplay && make install-libs install-headers)
 	touch $@
 
 CLEAN_FILE += .ffmpeg
diff --git a/extras/contrib/src/Patches/ffmpeg-beos.patch.cvs b/extras/contrib/src/Patches/ffmpeg-beos.patch.cvs
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/extras/contrib/src/Patches/ffmpeg-cvs-beos.patch b/extras/contrib/src/Patches/ffmpeg-cvs-beos.patch
new file mode 100644
index 0000000000..b8bce7f9e6
--- /dev/null
+++ b/extras/contrib/src/Patches/ffmpeg-cvs-beos.patch
@@ -0,0 +1,44 @@
+Index: configure
+===================================================================
+RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v
+retrieving revision 1.248
+diff -u -r1.248 configure
+--- configure	11 Feb 2006 20:37:12 -0000	1.248
++++ configure	12 Feb 2006 15:57:44 -0000
+@@ -634,6 +634,18 @@
+   esac
+ done
+ 
++if [ "$cross_prefix" = "i586-pc-beos-" ]; then
++  CFLAGS="$CFLAGS -DPIC -fomit-frame-pointer -fno-expensive-optimizations"
++  SHFLAGS=-nostart
++  audio_oss="no"
++  v4l="no"
++  v4l2="no"
++  dv1394="no"
++  netserver="yes"
++  need_inet_aton="yes"
++  extralibs="-lnet"
++fi
++
+ # we need to build at least one lib type
+ if test "$lstatic" = "no" && test "$lshared" = "no" ; then
+     cat <<EOF
+Index: libavformat/movenc.c
+===================================================================
+RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/movenc.c,v
+retrieving revision 1.52
+diff -u -r1.52 movenc.c
+--- libavformat/movenc.c	11 Feb 2006 18:27:57 -0000	1.52
++++ libavformat/movenc.c	12 Feb 2006 15:57:44 -0000
+@@ -25,6 +25,10 @@
+ #undef NDEBUG
+ #include <assert.h>
+ 
++#ifndef UINT32_MAX
++#define UINT32_MAX 4294967295U
++#endif
++
+ #define MOV_INDEX_CLUSTER_SIZE 16384
+ #define globalTimescale 1000
+