diff --git a/conf/checksums.ini b/conf/checksums.ini
index 5705ad8a90..022e81b186 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -5766,6 +5766,10 @@ sha256=0e9e771114a75c461e813538f129eb05a251b8fc6591a5563420700b8e312da0
 md5=ea5587e3c66d50b1503b82ac4179c303
 sha256=0e9e771114a75c461e813538f129eb05a251b8fc6591a5563420700b8e312da0
 
+[http://ffmpeg.org/releases/ffmpeg-0.5.tar.bz2]
+md5=be8503f15c3b81ba00eb8379ca8dcf33
+sha256=16de61d7426b1df7aee54b48c16aa728de1ed82f95db5fc4d8886d5d2702d90a
+
 [http://folks.o-hand.com/dodji/0xdeadbabe/ffmpeg_xine.tar.bz2]
 md5=e67e1c2eb134d2fba50a524188b6a3b4
 sha256=61ba89c0deaaf324485b2bf480fdb90941b74e2c47b4810e34f530b77005bb8c
diff --git a/packages/ffmpeg/ffmpeg_0.5.bb b/packages/ffmpeg/ffmpeg_0.5.bb
new file mode 100644
index 0000000000..e49478a215
--- /dev/null
+++ b/packages/ffmpeg/ffmpeg_0.5.bb
@@ -0,0 +1,59 @@
+require ffmpeg.inc
+
+DEPENDS += "schroedinger libgsm"
+
+PE = "1"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "1"
+
+SRCREV_libswscale = "b2e1c8222eeef74b0ca8053b400957dd69e18e4d"
+SRC_URI = "http://ffmpeg.org/releases/ffmpeg-${PV}.tar.bz2"
+
+#S = "${WORKDIR}/git"
+B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
+
+FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations  -ftree-vectorize -fomit-frame-pointer -O4 -ffast-math"
+BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
+
+EXTRA_FFCONF_armv7a = "--cpu=cortex-a8"
+EXTRA_FFCONF ?= ""
+
+EXTRA_OECONF = " \
+        --enable-shared \
+        --enable-pthreads \
+        --disable-stripping \
+        --enable-gpl \
+        --enable-nonfree \
+        --enable-postproc \
+        \
+        --cross-prefix=${TARGET_PREFIX} \
+        --prefix=${prefix} \
+        \
+        --enable-x11grab \
+        --enable-libfaac \
+        --enable-libfaad \
+        --enable-libfaadbin \
+        --enable-libgsm \
+        --enable-libmp3lame \
+        --enable-libschroedinger \
+        --enable-libtheora  \
+        --enable-libvorbis \
+        --enable-swscale \
+        --arch=${TARGET_ARCH} \
+        --enable-cross-compile \
+        --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
+        --extra-ldflags="${TARGET_LDFLAGS}" \
+        --enable-hardcoded-tables \
+        ${EXTRA_FFCONF} \
+"
+
+do_configure() {
+        sed -i -e s:'check_cflags -std=c99'::g ${S}/configure
+        cd ${S}
+        mkdir -p ${B}
+        cd ${B}
+        ${S}/configure ${EXTRA_OECONF}
+		sed -i -e s:Os:O4:g ${B}/config.h
+}
+