diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix
index 30837adba84..b0151ba4dcb 100644
--- a/pkgs/applications/video/gnash/default.nix
+++ b/pkgs/applications/video/gnash/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl
-, SDL, SDL_mixer, gstreamer, gstreamerPluginsBase
+, SDL, SDL_mixer, gstreamer, gstPluginsBase, gstFfmpeg
 , libogg, libxml2, libjpeg, mesa, libpng, libungif, libtool
 , boost, freetype, agg, dbus, curl, pkgconfig, gettext
 , glib, gtk, x11, ming, dejagnu, python
-, lib}:
+, lib, makeWrapper }:
 
 let version = "0.8.4"; in
 stdenv.mkDerivation rec {
@@ -35,9 +35,10 @@ stdenv.mkDerivation rec {
 
   # XXX: KDE is supported as well so we could make it available optionally.
   buildInputs = [
-    gettext x11 SDL SDL_mixer gstreamer gstreamerPluginsBase libtool
+    gettext x11 SDL SDL_mixer gstreamer gstPluginsBase gstFfmpeg libtool
     libogg libxml2 libjpeg mesa libpng libungif boost freetype agg
     dbus curl pkgconfig glib gtk
+    makeWrapper
 
     # For the test suite
     ming dejagnu python
@@ -51,7 +52,18 @@ stdenv.mkDerivation rec {
   #doCheck = true;
 
   preInstall = ''ensureDir $out/plugins'';
-  postInstall = ''make install-plugins'';
+  postInstall = ''
+    make install-plugins
+
+    # Wrap programs so the find the GStreamer plug-ins they need
+    # (e.g., gst-ffmpeg is needed to watch movies such as YouTube's).
+    for prog in $out/bin/*
+    do
+      wrapProgram "$prog" --prefix                                              \
+        GST_PLUGIN_PATH ":"                                                     \
+        "${gstPluginsBase}/lib/gstreamer-0.10:${gstFfmpeg}/lib/gstreamer-0.10"
+    done
+  '';
 
   meta = {
     homepage = http://www.gnu.org/software/gnash/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 268ad89633b..4cb38c31d54 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7287,10 +7287,9 @@ let
   gnash = assert mesaSupported; import ../applications/video/gnash {
     inherit fetchurl stdenv SDL SDL_mixer libogg libxml2 libjpeg mesa libpng
             boost freetype agg dbus curl pkgconfig x11 libtool lib libungif
-            gettext ming dejagnu python;
+            gettext makeWrapper ming dejagnu python;
     inherit (gtkLibs) glib gtk;
-    gstreamer = gst_all.gstreamer;
-    gstreamerPluginsBase = gst_all.gstPluginsBase;
+    inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg;
   };
 
   gnunet = import ../applications/networking/p2p/gnunet {