diff --git a/srcpkgs/zsnes/files/zsnes.desktop b/srcpkgs/zsnes/files/zsnes.desktop
new file mode 100644
index 0000000000..131f3b88b0
--- /dev/null
+++ b/srcpkgs/zsnes/files/zsnes.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=Zsnes
+Comment=Super Nintendo emulator
+Exec=zsnes
+Icon=zsnes
+Terminal=false
+StartupNotify=false
+Categories=Application;Game;
diff --git a/srcpkgs/zsnes/files/zsnes.png b/srcpkgs/zsnes/files/zsnes.png
new file mode 100644
index 0000000000..31608ba068
Binary files /dev/null and b/srcpkgs/zsnes/files/zsnes.png differ
diff --git a/srcpkgs/zsnes/patches/patch-makefilein b/srcpkgs/zsnes/patches/patch-makefilein
new file mode 100644
index 0000000000..76cecfd8ca
--- /dev/null
+++ b/srcpkgs/zsnes/patches/patch-makefilein
@@ -0,0 +1,15 @@
+$NetBSD: patch-makefilein,v 1.1 2007/06/06 22:05:45 rillig Exp $
+
+When linking a program, the linking flags are needed.
+
+--- src/Makefile.in.orig	2007-01-24 21:54:12.000000000 +0100
++++ src/Makefile.in	2007-06-06 23:59:19.000000000 +0200
+@@ -104,7 +104,7 @@ main: makefile.dep $(Z_OBJS)
+ 	rm -f version.o
+ 
+ $(PSR): parsegen.cpp
+-	@CXX@ @CXXFLAGS@ -o $@ $< -lz
++	@CXX@ @CXXFLAGS@ -o $@ $< @LDFLAGS@ @LIBS@ -lz
+ 
+ TOOLSEXE=$(TOOL_D)/archopt $(TOOL_D)/cutrtype $(TOOL_D)/extraext\
+ 	$(TOOL_D)/macroll $(TOOL_D)/minwhite $(TOOL_D)/nreplace\
diff --git a/srcpkgs/zsnes/patches/patch-tools_strutil.h b/srcpkgs/zsnes/patches/patch-tools_strutil.h
new file mode 100644
index 0000000000..3eab2309ff
--- /dev/null
+++ b/srcpkgs/zsnes/patches/patch-tools_strutil.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-tools_strutil.h,v 1.1 2012/12/17 03:37:20 dholland Exp $
+
+add <cstring> for strcasecmp.
+
+--- src/tools/strutil.h~	2006-12-27 11:04:05.000000000 +0000
++++ src/tools/strutil.h
+@@ -23,6 +23,7 @@ This is part of a toolkit used to assist
+ #define STRUTIL_H
+ 
+ #include <string>
++#include <cstring>
+ #include <vector>
+ #include <cctype>
+ 
diff --git a/srcpkgs/zsnes/patches/patch-zip_zpng.c b/srcpkgs/zsnes/patches/patch-zip_zpng.c
new file mode 100644
index 0000000000..a2cc3ac333
--- /dev/null
+++ b/srcpkgs/zsnes/patches/patch-zip_zpng.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-zip_zpng.c,v 1.1 2011/03/15 11:46:09 obache Exp $
+
+* direct access is not allowed with png-1.5, but already set color_type.
+
+--- src/zip/zpng.c.orig	2007-01-15 23:06:29.000000000 +0000
++++ src/zip/zpng.c
+@@ -129,7 +129,6 @@ int Png_Dump(const char *filename, unsig
+         png_set_IHDR(png_ptr, info_ptr, width, height, 8,
+                      PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE,
+                      PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
+-        info_ptr->color_type = PNG_COLOR_TYPE_RGB;
+ 
+         //Allocate an array of scanline pointers
+         row_pointers = (png_bytep*)malloc(height*sizeof(png_bytep));
diff --git a/srcpkgs/zsnes/patches/zsnes.patch b/srcpkgs/zsnes/patches/zsnes.patch
new file mode 100644
index 0000000000..758402a363
--- /dev/null
+++ b/srcpkgs/zsnes/patches/zsnes.patch
@@ -0,0 +1,80 @@
+diff -aur zsnes_1_51//src/Makefile.in zsnes_1_51_new//src/Makefile.in
+--- src/Makefile.in	2007-01-24 21:54:12.000000000 +0100
++++ src/Makefile.in	2010-09-06 00:03:04.715810431 +0200
+@@ -95,7 +95,7 @@
+ %.o: %.cpp
+ 	@CXX@ @CXXFLAGS@ -o $@ -c $<
+ %.o %.h: %.psr $(PSR)
+-	./$(PSR) @PSRFLAGS@ -gcc @CC@ -compile -flags "@CFLAGS@ -O1" -cheader $*.h -fname $* $*.o $<
++	./$(PSR) @PSRFLAGS@ -gcc "@CC@" -compile -flags "@CFLAGS@ -O1 -D_FORTIFY_SOURCE=0" -cheader $*.h -fname $* $*.o $<
+ 
+ default: main
+ all: main tools
+@@ -133,7 +133,7 @@
+ 
+ include makefile.dep
+ makefile.dep: $(TOOL_D)/depbuild Makefile
+-	$(TOOL_D)/depbuild @CC@ "@CFLAGS@" @NASMPATH@ "@NFLAGS@" $(Z_OBJS) > makefile.dep
++	$(TOOL_D)/depbuild "@CC@" "@CFLAGS@" "@NASMPATH@" "@NFLAGS@" $(Z_OBJS) > makefile.dep
+ 
+ Makefile: Makefile.in config.status
+ 	./config.status
+diff -aur zsnes_1_51//src/parsegen.cpp zsnes_1_51_new//src/parsegen.cpp
+--- src/parsegen.cpp	2007-10-31 05:30:26.000000000 +0100
++++ src/parsegen.cpp	2010-09-05 15:48:36.903333444 +0200
+@@ -19,6 +19,9 @@
+ Config file handler creator by Nach (C) 2005-2007
+ */
+ 
++#include <cstring>
++#include <cstdlib>
++
+ #if !defined(__GNUC__) && !defined(_MSC_VER)
+ #error You are using an unsupported compiler
+ #endif
+@@ -1822,7 +1825,7 @@
+   }
+ }
+ 
+-int main(size_t argc, const char *const *const argv)
++int main(int argc, const char *const *const argv)
+ {
+   const char *cheader_file = 0;
+   bool compile = false;
+diff -aur zsnes_1_51//src/tools/depbuild.cpp zsnes_1_51_new//src/tools/depbuild.cpp
+--- src/tools/depbuild.cpp	2006-12-27 12:04:05.000000000 +0100
++++ src/tools/depbuild.cpp	2010-09-05 15:48:36.903333444 +0200
+@@ -183,7 +183,7 @@
+   }
+ }
+ 
+-int main(size_t argc, const char *const *const argv)
++int main(int argc, const char *const *const argv)
+ {
+   if (argc < 5)
+   {
+diff -aur zsnes_1_51//src/tools/strutil.h zsnes_1_51_new//src/tools/strutil.h
+--- src/tools/strutil.h	2006-12-27 12:04:05.000000000 +0100
++++ src/tools/strutil.h	2010-09-05 15:48:36.903333444 +0200
+@@ -15,6 +15,9 @@
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ 
++#include <cstring>
++#include <cstdlib>
++
+ /*
+ This is part of a toolkit used to assist in ZSNES development
+ */
+diff -u -r zsnes_1_51/src/tools/depbuild.cpp zsnes_1_51-fix/src/tools/depbuild.cpp
+--- src/tools/depbuild.cpp	2006-12-27 12:04:05.000000000 +0100
++++ src/tools/depbuild.cpp	2012-07-14 16:20:17.759886250 +0200
+@@ -26,6 +26,8 @@
+ #include <cstdio>
+ using namespace std;
+ 
++#include <unistd.h>
++
+ #include "fileutil.h"
+ #include "strutil.h"
+ 
diff --git a/srcpkgs/zsnes/template b/srcpkgs/zsnes/template
new file mode 100644
index 0000000000..45967b819d
--- /dev/null
+++ b/srcpkgs/zsnes/template
@@ -0,0 +1,30 @@
+# Template file for 'zsnes'
+#
+# 32bit 
+only_for_archs="i686"
+lib32mode="full"
+wrksrc="zsnes_1_51"
+build_wrksrc="src"
+
+pkgname=zsnes
+version=1.51
+revision=1
+build_style=gnu-configure
+configure_args="force_arch=i686"
+hostmakedepends="nasm pkg-config"
+makedepends="MesaLib-devel SDL-devel libpng-devel ncurses-devel desktop-file-utils hicolor-icon-theme"
+depends="desktop-file-utils hicolor-icon-theme"
+short_desc="Super Nintendo emulator"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL"
+homepage="http://www.zsnes.com/"
+distfiles="${SOURCEFORGE_SITE}/zsnes/zsnes151src.tar.bz2"
+checksum=2856dedba272e9eed66cbf68dd4a9ae56797c373686c57371a65c7df35264623
+
+post_install() {
+	vmkdir usr/share
+	mv ${DESTDIR}/usr/man ${DESTDIR}/usr/share
+
+	vinstall ${FILESDIR}/zsnes.png 644 usr/share/pixmaps
+	vinstall ${FILESDIR}/zsnes.desktop 644 usr/share/applications
+}