diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix
index b7b030ad327..4713ebf4d54 100644
--- a/pkgs/applications/video/gnash/default.nix
+++ b/pkgs/applications/video/gnash/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchurl
-, SDL, SDL_mixer, GStreamer
-, libogg, libxml2, libjpeg, mesa, libpng, libtool
-, boost, freetype, agg, dbus, curl, pkgconfig
-, glib, gtk, x11
+, SDL, SDL_mixer, gstreamer, gstreamerPluginsBase
+, libogg, libxml2, libjpeg, mesa, libpng, libungif, libtool
+, boost, freetype, agg, dbus, curl, pkgconfig, gettext
+, glib, gtk, x11, ming, dejagnu, python
 , lib}:
 
-let version = "0.8.3"; in
+let version = "0.8.4"; in
 stdenv.mkDerivation rec {
   name = "gnash-${version}";
 
   src = fetchurl {
     url = "mirror://gnu/gnash/${version}/${name}.tar.bz2";
-    sha256 = "16n32774sd5q4nkd95v2m8r2yfa9fk30jnq1iicarq3j8i2xh7xg";
+    sha256 = "094jky77ghdisq17z742cwn3g9ckm937p8h5jbji5rrdqbdlpzkg";
   };
 
   builder = ./builder.sh;
@@ -34,9 +34,15 @@ stdenv.mkDerivation rec {
 
 
   # XXX: KDE is supported as well so we could make it available optionally.
-  buildInputs = [x11 SDL SDL_mixer GStreamer libtool
-                 libogg libxml2 libjpeg mesa libpng boost freetype agg
-		 dbus curl pkgconfig glib gtk];
+  buildInputs = [
+    gettext x11 SDL SDL_mixer gstreamer gstreamerPluginsBase libtool
+    libogg libxml2 libjpeg mesa libpng libungif boost freetype agg
+    dbus curl pkgconfig glib gtk
+
+    # For the test suite
+    ming dejagnu python
+  ];
+
   inherit SDL_mixer SDL;
 
   # Make sure `gtk-gnash' gets `libXext' in its `RPATH'.
@@ -47,7 +53,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.gnu.org/software/gnash/;
-    description = ''Gnash is the GNU Flash movie player.'';
+    description = "GNU Gnash, an SWF movie player";
     license = "GPLv3+";
   };
 } // {mozillaPlugin = "/plugins";}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 129c0bb4c7d..7bac5379623 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6349,9 +6349,11 @@ 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;
+            boost freetype agg dbus curl pkgconfig x11 libtool lib libungif
+            gettext ming dejagnu python;
     inherit (gtkLibs) glib gtk;
-    GStreamer = gst_all.gstreamer;
+    gstreamer = gst_all.gstreamer;
+    gstreamerPluginsBase = gst_all.gstPluginsBase;
   };
 
   gnunet = import ../applications/networking/p2p/gnunet {