diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index 70f7feaaf1a9..2cc24d32c3ab 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, faad2, libtheora, speex, libvorbis, x264, pkgconfig, xvidcore}:
+{stdenv, fetchurl, faad2, libtheora, speex, libvorbis, x264, pkgconfig, xvidcore, lame, yasm}:
 
 stdenv.mkDerivation {
   name = "ffmpeg-0.5.1";
@@ -24,9 +24,11 @@ stdenv.mkDerivation {
     --enable-libspeex
     --enable-libx264
     --enable-libxvid
+    --enable-libmp3lame
+    --enable-runtime-cpudetect
   '';
 
-  buildInputs = [faad2 libtheora speex libvorbis x264 pkgconfig xvidcore];
+  buildInputs = [faad2 libtheora speex libvorbis x264 pkgconfig xvidcore lame yasm];
 
   meta = {
     homepage = http://www.ffmpeg.org/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 34e3d138abe9..928baa70c24f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3738,7 +3738,8 @@ let
   };
 
   ffmpeg = import ../development/libraries/ffmpeg {
-    inherit fetchurl stdenv faad2 libvorbis speex libtheora x264 pkgconfig xvidcore;
+    inherit fetchurl stdenv faad2 libvorbis speex libtheora x264 pkgconfig xvidcore
+      lame yasm;
   };
 
   fftw = import ../development/libraries/fftw {