diff --git a/media-video/ffmpeg/ffmpeg-0.6.bep b/media-video/ffmpeg/ffmpeg-0.6.bep
new file mode 100644
index 000000000..55e3a004b
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-0.6.bep
@@ -0,0 +1,21 @@
+DESCRIPTION="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. It includes libavcodec - the leading audio/video codec library." 
+HOMEPAGE="http://www.ffmpeg.org" 
+SRC_URI="http://ffmpeg.org/releases/ffmpeg-0.6.tar.bz2"
+CHECKSUM_MD5="d6142a9a5821d6a6262a6edb903faa24"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND=""
+BUILD {
+	cd ffmpeg-0.6
+	./configure --prefix=/boot/common --disable-debug --disable-mmx --enable-shared
+	make
+}
+
+INSTALL {
+	cd ffmpeg-0.6
+	make install
+}
+
+LICENSE="GNU LGPL v2.1
+	GNU GPL v2"
+COPYRIGHT="2000-2003 Fabrice Bellard"
diff --git a/media-video/ffmpeg/patches/ffmpeg-0.6.patch b/media-video/ffmpeg/patches/ffmpeg-0.6.patch
new file mode 100644
index 000000000..c29fea383
--- /dev/null
+++ b/media-video/ffmpeg/patches/ffmpeg-0.6.patch
@@ -0,0 +1,22 @@
+--- ffmpeg-0.6/configure	2010-06-15 19:44:30.020447232 +0000
++++ ffmpeg-0.6-haiku/configure	2010-07-13 20:40:48.244056064 +0000
+@@ -2127,7 +2127,7 @@
+ 
+ # OS specific
+ case $target_os in
+-    beos|haiku|zeta)
++    beos|zeta)
+         prefix_default="$HOME/config"
+         # 3 gcc releases known for BeOS, each with ugly bugs
+         gcc_version="$($cc -v 2>&1 | grep version | cut -d ' ' -f3-)"
+@@ -2151,6 +2148,10 @@
+             enable beos_netserver
+             network_extralibs="-lnet"
+         fi ;;
++    haiku)
++        prefix_default="/boot/common"
++        network_extralibs="-lnetwork"
++        ;;
+     sunos)
+         FFSERVERLDFLAGS=""
+         SHFLAGS='-shared -Wl,-h,$$(@F)'