diff --git a/srcpkgs/ffmpeg/libavcodec.rshlibs b/srcpkgs/ffmpeg/libavcodec.rshlibs
index 0a194268e4..448955de41 100644
--- a/srcpkgs/ffmpeg/libavcodec.rshlibs
+++ b/srcpkgs/ffmpeg/libavcodec.rshlibs
@@ -12,3 +12,5 @@ libz.so.1
 libc.so.6
 libx264.so.120
 libvpx.so.1
+libspeex.so.1
+libcelt0.so.2
diff --git a/srcpkgs/ffmpeg/libavdevice.rshlibs b/srcpkgs/ffmpeg/libavdevice.rshlibs
index a1b216899a..f07cfe3471 100644
--- a/srcpkgs/ffmpeg/libavdevice.rshlibs
+++ b/srcpkgs/ffmpeg/libavdevice.rshlibs
@@ -11,3 +11,7 @@ libX11.so.6
 libXext.so.6
 libXfixes.so.3
 libavfilter.so.2
+libcdio_paranoia.so.1
+libcdio_cdda.so.1
+libpulse-simple.so.0
+libpulse.so.0
diff --git a/srcpkgs/ffmpeg/libavfilter.rshlibs b/srcpkgs/ffmpeg/libavfilter.rshlibs
index 261f1a5a57..f3d934c83b 100644
--- a/srcpkgs/ffmpeg/libavfilter.rshlibs
+++ b/srcpkgs/ffmpeg/libavfilter.rshlibs
@@ -6,3 +6,5 @@ libm.so.6
 libpthread.so.0
 libc.so.6
 libswresample.so.0
+libfreetype.so.6
+libass.so.4
diff --git a/srcpkgs/ffmpeg/libavformat.rshlibs b/srcpkgs/ffmpeg/libavformat.rshlibs
index b8dbadba3f..d868ca82b7 100644
--- a/srcpkgs/ffmpeg/libavformat.rshlibs
+++ b/srcpkgs/ffmpeg/libavformat.rshlibs
@@ -5,3 +5,5 @@ libm.so.6
 libbz2.so.1
 libz.so.1
 libc.so.6
+librtmp.so.0
+libmodplug.so.1
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index e7d771c445..6a74a60cfa 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,14 +1,18 @@
 # Template file for 'ffmpeg'
 pkgname=ffmpeg
 version=0.10.3
-homepage="http://www.ffmpeg.org"
-distfiles="${homepage}/releases/ffmpeg-${version}.tar.bz2"
-depends="faad2 x264 xvidcore libvdpau"
-makedepends="pkg-config perl>=0 yasm zlib-devel alsa-lib-devel libXfixes-devel libXext-devel libXvMC-devel faad2-devel lame-devel libtheora-devel libvorbis-devel x264-devel xvidcore-devel jack-devel SDL-devel libvpx-devel libva-devel libvdpau-devel"
-revision=1
+revision=2
+#depends="faad2 x264 xvidcore libvdpau"
+makedepends="pkg-config perl yasm zlib-devel alsa-lib-devel libXfixes-devel
+libXext-devel libXvMC-devel faad2-devel lame-devel libtheora-devel
+libvorbis-devel x264-devel xvidcore-devel jack-devel SDL-devel libcdio-devel
+libvpx-devel libva-devel libvdpau-devel librtmp-devel pulseaudio-devel
+freetype-devel libmodplug-devel speex-devel celt-devel libass-devel"
 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=7d1ca0abc80e2f6161e2a48878b62a2e6d0301c231f91e7677b889ef048b931f
 long_desc="
  FFmpeg is the first complete and free Internet Live Audio and Video
@@ -23,9 +27,7 @@ long_desc="
  simultaneously, faster than any other solution."
 
 subpackages="libavcodec libavdevice libavformat libavutil libavfilter"
-subpackages="${subpackages} libpostproc libswscale libswresample $pkgname-devel"
-
-
+subpackages="${subpackages} libpostproc libswscale libswresample ffmpeg-devel"
 
 do_configure() {
 	./configure --prefix=/usr --disable-debug --enable-gpl \
@@ -33,7 +35,10 @@ do_configure() {
 		--enable-libmp3lame --enable-libvorbis --enable-libxvid \
 		--enable-libx264 --enable-libvpx --enable-libtheora \
 		--enable-vdpau --enable-vaapi --enable-postproc \
-		--enable-shared --enable-x11grab \
+		--enable-shared --enable-x11grab --enable-librtmp \
+		--enable-libpulse --enable-libfreetype --enable-libmodplug \
+		--enable-libspeex --enable-libcelt --enable-libass \
+		--enable-libcdio \
 		--disable-libopencore_amrnb --disable-libopencore_amrwb \
 		--disable-libschroedinger --disable-libopenjpeg
 }