diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix
new file mode 100644
index 00000000000..d878d34184a
--- /dev/null
+++ b/pkgs/misc/emulators/zsnes/default.nix
@@ -0,0 +1,36 @@
+{stdenv, fetchurl, nasm, SDL, zlib, libpng, ncurses, mesa}:
+
+stdenv.mkDerivation {
+  name = "zsnes-1.51";
+  
+  src = fetchurl {
+    url = mirror://sourceforge/zsnes/zsnes151src.tar.bz2;
+    sha256 = "08s64qsxziv538vmfv38fg1rfrz5k95dss5zdkbfxsbjlbdxwmi8";
+  };
+
+  buildInputs = [ nasm SDL zlib libpng ncurses mesa ];
+  
+  preConfigure = ''
+    cd src
+    
+    # Fix for undefined strncasecmp()
+    echo '#include <strings.h>' > tmp.cpp 
+    cat tmp.cpp tools/strutil.h > tools/strutil.h.new
+    mv tools/strutil.h.new tools/strutil.h
+    
+    # Fix for undefined system()
+    echo '#include <stdlib.h>' > tmp.cpp
+    cat tmp.cpp tools/depbuild.cpp > tools/depbuild.cpp.new
+    mv tools/depbuild.cpp.new tools/depbuild.cpp
+    
+    # Fix for lots of undefined strcmp, strncmp etc.
+    echo '#include <string.h>' > tmp.cpp 
+    cat tmp.cpp parsegen.cpp > parsegen.cpp.new
+    mv parsegen.cpp.new parsegen.cpp
+  '';
+  
+  meta = {
+    description = "A Super Nintendo Entertainment System Emulator";
+    license = "GPLv2";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 26d2c04b006..fe3832c3893 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8090,6 +8090,8 @@ let
     inherit (stdenv) mkDerivation;
   };
 
+  zsnes = callPackage_i686 ../misc/emulators/zsnes { };
+
   misc = import ../misc/misc.nix { inherit pkgs stdenv; };
 
 }; in pkgs