diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 70618fafddfb..d6d8fa084be1 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, zip, pandoc }:
+{ stdenv, fetchurl, makeWrapper, python, zip, pandoc, ffmpeg }:
 
 let
   version = "2015.03.24";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1m462hcgizdp59s9h62hjwhq4vjrgmck23x2bh5jvb9vjpcfqjxv";
   };
 
-  buildInputs = [ python ];
+  buildInputs = [ python makeWrapper ];
   nativeBuildInputs = [ zip pandoc ];
 
   patchPhase = ''
@@ -22,6 +22,11 @@ stdenv.mkDerivation rec {
     makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc PYTHON=${python}/bin/python )
   '';
 
+  postInstall = ''
+    # ffmpeg is used for post-processing and fixups
+    wrapProgram $out/bin/youtube-dl --prefix PATH : "${ffmpeg}/bin"
+  '';
+
   meta = {
     homepage = "http://rg3.github.com/youtube-dl/";
     repositories.git = https://github.com/rg3/youtube-dl.git;