diff --git a/common/shlibs b/common/shlibs
index 803d95c8c4..25d419f46e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -357,13 +357,17 @@ libgif.so.6 giflib-5.0.1_1
 libImlib2.so.1 imlib2-1.4.2_1
 libmp3lame.so.0 lame-3.98.2_1
 libavdevice.so.53 libavdevice-0.8.6_1
+libavdevice.so.54 libavdevice-1.0_1
 libavformat.so.53 libavformat-0.8.6_1
+libavformat.so.54 libavformat-1.0.1_1
 libswscale.so.2 libswscale-0.8.6_1
 libswresample.so.0 libswresample-0.8.6_1
 libpostproc.so.52 libpostproc-0.8.6_1
 libavcodec.so.53 libavcodec-0.8.6_1
+libavcodec.so.54 libavcodec-1.0.1_1
 libavutil.so.51 libavutil-0.8.6_1
 libavfilter.so.2 libavfilter-0.8.6_1
+libavfilter.so.3 libavfilter-1.0.1_1
 libSDL-1.2.so.0 SDL-1.2.14_1
 libSDL_image-1.2.so.0 SDL_image-1.2.10_1
 libx264.so.120 x264-20120126_1
diff --git a/srcpkgs/ffmpeg/ffmpeg-devel.template b/srcpkgs/ffmpeg/ffmpeg-devel.template
index 42a44a5727..8911c2ba93 100644
--- a/srcpkgs/ffmpeg/ffmpeg-devel.template
+++ b/srcpkgs/ffmpeg/ffmpeg-devel.template
@@ -1,15 +1,17 @@
 # Template file for 'ffmpeg-devel'.
 #
-depends="libavcodec libavdevice libavformat libavutil libavfilter libpostproc libswscale libswresample"
+depends="libavcodec>=${version} libavdevice>=${version} libavformat>=${version}
+libavutil>=${version} libavfilter>=${version} libpostproc>=${version}
+libswscale>=${version} libswresample>=${version}"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+noarch=yes
 
 do_install() {
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove usr/share/ffmpeg/examples usr/share/ffmpeg
 }
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 3aa35087b5..9828add574 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,13 +1,13 @@
 # Template file for 'ffmpeg'
 pkgname=ffmpeg
-version=0.10.6
+version=1.0.1
 revision=1
 short_desc="Decoding, encoding and streaming software"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
 homepage="http://www.ffmpeg.org"
 distfiles="${homepage}/releases/ffmpeg-${version}.tar.bz2"
-checksum=8c67c0be9dc568a857d5542247aa4e3c1c6538fa3643b47c9deb7ff004a97626
+checksum=758840dcfc94eb7fd6263718d26408658a59422e5fb8ac4de8e7ecf0cbed6e76
 long_desc="
  FFmpeg is the first complete and free Internet Live Audio and Video
  Broadcasting solution. FFMpeg aims at being the command line tool to
@@ -41,7 +41,8 @@ do_configure() {
 		--enable-libpulse --enable-libfreetype --enable-libmodplug \
 		--enable-libspeex --enable-libcelt --enable-libass \
 		--disable-libopencore_amrnb --disable-libopencore_amrwb \
-		--disable-libschroedinger --disable-libopenjpeg
+		--disable-libschroedinger --disable-libopenjpeg \
+		--disable-static
 }
 
 do_build() {