diff --git a/packages/addons/emulators/zsnes/arch b/packages/addons/emulators/zsnes/arch
new file mode 100644
index 0000000000..5a9a476a8b
--- /dev/null
+++ b/packages/addons/emulators/zsnes/arch
@@ -0,0 +1 @@
+i386
diff --git a/packages/addons/emulators/zsnes/build b/packages/addons/emulators/zsnes/build
new file mode 100755
index 0000000000..8c959b129f
--- /dev/null
+++ b/packages/addons/emulators/zsnes/build
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+. config/options
+
+$SCRIPTS/build toolchain
+$SCRIPTS/build SDL
+$SCRIPTS/build zlib
+$SCRIPTS/build libpng
+$SCRIPTS/build Mesa
+
+export force_arch="$TARGET_CPU" \
+export CC_FOR_BUILD="$HOST_CC" \
+export CXX_FOR_BUILD="$HOST_CXX" \
+export CPPFLAGS_FOR_BUILD="$HOST_CPPFLAGS" \
+export CFLAGS_FOR_BUILD="$HOST_CFLAGS" \
+export CXXFLAGS_FOR_BUILD="$HOST_CXXFLAGS" \
+export LDFLAGS_FOR_BUILD="$HOST_LDFLAGS" \
+export SDL_CONFIG=$ROOT/$TOOLCHAIN/bin/sdl-config
+
+cd $PKG_BUILD/src
+
+$AUTORECONF
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --sysconfdir=/etc \
+            --enable-release \
+            --disable-debug \
+            --disable-debugger \
+            --disable-cpucheck \
+            --disable-sdltest \
+            --enable-opengl \
+            --with-opengl-prefix=$SYSROOT_PREFIX/usr \
+            --enable-jma \
+            --enable-libpng \
+            --with-libpng-prefix=$SYSROOT_PREFIX/usr \
+            --with-zlib-prefix=$SYSROOT_PREFIX/usr \
+            --with-x \
+
+make
diff --git a/packages/addons/emulators/zsnes/install b/packages/addons/emulators/zsnes/install
new file mode 100755
index 0000000000..91c10e4148
--- /dev/null
+++ b/packages/addons/emulators/zsnes/install
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+. config/options
+
+$SCRIPTS/install SDL
+$SCRIPTS/install zlib
+$SCRIPTS/install libpng
+$SCRIPTS/install Mesa
+
+mkdir -p $INSTALL/etc/zsnes
+
+mkdir -p $INSTALL/usr/bin
+  cp $PKG_BUILD/src/zsnes $INSTALL/usr/bin
diff --git a/packages/addons/emulators/zsnes/patches/zsnes-1.51-gcc_4.3.diff b/packages/addons/emulators/zsnes/patches/zsnes-1.51-gcc_4.3.diff
new file mode 100644
index 0000000000..500809b5e9
--- /dev/null
+++ b/packages/addons/emulators/zsnes/patches/zsnes-1.51-gcc_4.3.diff
@@ -0,0 +1,51 @@
+diff -Naur zsnes-1.51-old/src/parsegen.cpp zsnes-1.51-new/src/parsegen.cpp
+--- zsnes-1.51-old/src/parsegen.cpp	2007-10-30 21:30:26.000000000 -0700
++++ zsnes-1.51-new/src/parsegen.cpp	2008-01-20 08:04:38.000000000 -0800
+@@ -25,6 +25,7 @@
+ 
+ #include <iostream>
+ #include <fstream>
++#include <cstring>
+ #include <string>
+ #include <vector>
+ #include <algorithm>
+@@ -1822,7 +1823,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 -Naur zsnes-1.51-old/src/tools/depbuild.cpp zsnes-1.51-new/src/tools/depbuild.cpp
+--- zsnes-1.51-old/src/tools/depbuild.cpp	2006-12-27 03:04:05.000000000 -0800
++++ zsnes-1.51-new/src/tools/depbuild.cpp	2008-01-20 08:08:25.000000000 -0800
+@@ -23,6 +23,7 @@
+ 
+ #include <iostream>
+ #include <string>
++#include <cstdlib>
+ #include <cstdio>
+ using namespace std;
+ 
+@@ -183,7 +184,7 @@
+   }
+ }
+ 
+-int main(size_t argc, const char *const *const argv)
++int main(int argc, const char *const *const argv)
+ {
+   if (argc < 5)
+   {
+diff -Naur zsnes-1.51-old/src/tools/strutil.h zsnes-1.51-new/src/tools/strutil.h
+--- zsnes-1.51-old/src/tools/strutil.h	2006-12-27 03:04:05.000000000 -0800
++++ zsnes-1.51-new/src/tools/strutil.h	2008-01-20 08:09:12.000000000 -0800
+@@ -25,6 +25,7 @@
+ #include <string>
+ #include <vector>
+ #include <cctype>
++#include <cstring>
+ 
+ struct ci_char_traits : public std::char_traits<char>
+ {
diff --git a/packages/addons/emulators/zsnes/patches/zsnes-1.51.diff b/packages/addons/emulators/zsnes/patches/zsnes-1.51.diff
new file mode 100644
index 0000000000..e04f12a461
--- /dev/null
+++ b/packages/addons/emulators/zsnes/patches/zsnes-1.51.diff
@@ -0,0 +1,174 @@
+diff -Naur zsnes_1_51/src/acinclude.m4 zsnes_1_51.patch/src/acinclude.m4
+--- zsnes_1_51/src/acinclude.m4	2006-12-27 11:59:22.000000000 +0100
++++ zsnes_1_51.patch/src/acinclude.m4	2010-07-12 19:24:51.537522194 +0200
+@@ -107,7 +107,7 @@
+   with_zlib=yes,
+   with_zlib=no,
+   [AC_MSG_RESULT(cross-compiling)
+-  with_zlib=""
++  with_zlib=yes
+   AC_MSG_WARN(Assuming zlib is available)])
+ 
+ if test x$with_zlib != x; then
+@@ -239,7 +239,7 @@
+   with_libpng=yes,
+   with_libpng=no,
+   [AC_MSG_RESULT(cross-compiling)
+-  with_libpng=""
++  with_libpng=yes
+   AC_MSG_WARN(Assuming libpng is available)])
+ 
+   if test x$with_libpng != x; then
+diff -Naur zsnes_1_51/src/configure.in zsnes_1_51.patch/src/configure.in
+--- zsnes_1_51/src/configure.in	2007-01-20 19:30:31.000000000 +0100
++++ zsnes_1_51.patch/src/configure.in	2010-07-12 19:24:51.538522174 +0200
+@@ -26,20 +26,76 @@
+ 
+ VERSION=1.51
+ 
+-CFLAGS="$CFLAGS -pipe -I. -I/usr/local/include -I/usr/include"
++CFLAGS="$CFLAGS -pipe -I."
+ dnl - You might wanna change -I/usr/include if you're trying to do this with
+ dnl Mingw, because it doesnt have a standard file tree. Maybe if ming do this
+ dnl else do -I/usr/include. Or some shit. You figure it out.
+ 
+-LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/lib"
++LDFLAGS="$LDFLAGS"
+ dnl - Same thing here.
+ 
+ dnl - Where are our compilers, and who are we compiling for?
++AC_CANONICAL_BUILD
++AC_CANONICAL_HOST
+ AC_CANONICAL_TARGET
+ AC_PROG_INSTALL
+ AC_PROG_CC
+ AC_PROG_CXX
+ 
++AC_MSG_CHECKING([for CC_FOR_BUILD])
++if test x$host != x$build ; then
++    CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
++else
++    CC_FOR_BUILD=${CC}
++fi
++AC_MSG_RESULT([$CC_FOR_BUILD])
++AC_SUBST(CC_FOR_BUILD)
++
++AC_MSG_CHECKING([for CXX_FOR_BUILD])
++if test x$host != x$build ; then
++    CXX_FOR_BUILD=${CXX_FOR_BUILD-gcc}
++else
++    CXX_FOR_BUILD=${CXX}
++fi
++AC_MSG_RESULT([$CXX_FOR_BUILD])
++AC_SUBST(CXX_FOR_BUILD)
++
++AC_MSG_CHECKING([for CPPFLAGS_FOR_BUILD])
++if test x$host != x$build ; then
++    CPPFLAGS_FOR_BUILD=${CPPFLAGS_FOR_BUILD}
++else
++    CPPFLAGS_FOR_BUILD=${CPPFLAGS}
++fi
++AC_MSG_RESULT([$CPPFLAGS_FOR_BUILD])
++AC_SUBST(CPPFLAGS_FOR_BUILD)
++
++AC_MSG_CHECKING([for CFLAGS_FOR_BUILD])
++if test x$host != x$build ; then
++    CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD}
++else
++    CFLAGS_FOR_BUILD=${CFLAGS}
++fi
++AC_MSG_RESULT([$CFLAGS_FOR_BUILD])
++AC_SUBST(CFLAGS_FOR_BUILD)
++
++AC_MSG_CHECKING([for CXXFLAGS_FOR_BUILD])
++if test x$host != x$build ; then
++    CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD}
++else
++    CXXFLAGS_FOR_BUILD=${CXXFLAGS}
++fi
++AC_MSG_RESULT([$CXXFLAGS_FOR_BUILD])
++AC_SUBST(CXXFLAGS_FOR_BUILD)
++
++AC_MSG_CHECKING([for LDFLAGS_FOR_BUILD])
++if test x$host != x$build ; then
++    LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD}
++else
++    LDFLAGS_FOR_BUILD=${LDFLAGS}
++fi
++AC_MSG_RESULT([$LDFLAGS_FOR_BUILD])
++AC_SUBST(LDFLAGS_FOR_BUILD)
++
+ AC_ARG_WITH(nasm-prefix,
+   [  --with-nasm-prefix=PFX  Prefix where nasm is installed (optional)],
+   nasm_prefix="$withval",
+diff -Naur zsnes_1_51/src/Makefile.in zsnes_1_51.patch/src/Makefile.in
+--- zsnes_1_51/src/Makefile.in	2007-01-24 21:54:12.000000000 +0100
++++ zsnes_1_51.patch/src/Makefile.in	2010-07-12 19:29:28.343520583 +0200
+@@ -104,32 +104,38 @@
+ 	rm -f version.o
+ 
+ $(PSR): parsegen.cpp
+-	@CXX@ @CXXFLAGS@ -o $@ $< -lz
++	@CXX_FOR_BUILD@ @CXXFLAGS_FOR_BUILD@ -o $@ $< -lz
+ 
+ TOOLSEXE=$(TOOL_D)/archopt $(TOOL_D)/cutrtype $(TOOL_D)/extraext\
+ 	$(TOOL_D)/macroll $(TOOL_D)/minwhite $(TOOL_D)/nreplace\
+ 	$(TOOL_D)/sec-test $(TOOL_D)/srccount $(TOOL_D)/varrep
+ tools: $(TOOLSEXE) $(TOOL_D)/depbuild
++$(TOOL_D)/fileutil.o: $(TOOL_D)/fileutil.cpp
++	@CXX_FOR_BUILD@ @CXXFLAGS_FOR_BUILD@ -o $@ -c $<
++$(TOOL_D)/strutil.o: $(TOOL_D)/strutil.cpp
++	@CXX_FOR_BUILD@ @CXXFLAGS_FOR_BUILD@ -o $@ -c $<
+ $(TOOL_D)/archopt: $(TOOL_D)/archopt.c
+-	@CC@ @CFLAGS@ -m32 -o $@ $@.c
++	@CC_FOR_BUILD@ @CFLAGS_FOR_BUILD@ -o $@ $@.c
+ $(TOOL_D)/cutrtype: $(TOOL_D)/cutrtype.cpp $(TOOL_O)
+-	@CXX@ @CXXFLAGS@ -o $@ $@.cpp $(TOOL_O)
++	@CXX_FOR_BUILD@ @CXXFLAGS_FOR_BUILD@ -o $@ $@.cpp $(TOOL_O)
+ $(TOOL_D)/depbuild: $(TOOL_D)/depbuild.cpp $(TOOL_O)
+-	@CXX@ @CXXFLAGS@ -o $@ $@.cpp $(TOOL_O)
++	@CXX_FOR_BUILD@ @CXXFLAGS_FOR_BUILD@ -o $@ $@.cpp $(TOOL_O)
+ $(TOOL_D)/extraext: $(TOOL_D)/extraext.cpp $(TOOL_O)
+-	@CXX@ @CXXFLAGS@ -o $@ $@.cpp $(TOOL_O)
++	@CXX_FOR_BUILD@ @CXXFLAGS_FOR_BUILD@ -o $@ $@.cpp $(TOOL_O)
+ $(TOOL_D)/macroll: $(TOOL_D)/macroll.cpp $(TOOL_O)
+-	@CXX@ @CXXFLAGS@ -o $@ $@.cpp $(TOOL_O)
++	@CXX_FOR_BUILD@ @CXXFLAGS_FOR_BUILD@ -o $@ $@.cpp $(TOOL_O)
+ $(TOOL_D)/minwhite: $(TOOL_D)/minwhite.cpp $(TOOL_O)
+-	@CXX@ @CXXFLAGS@ -o $@ $@.cpp $(TOOL_D)/fileutil.o
++	@CXX_FOR_BUILD@ @CXXFLAGS_FOR_BUILD@ -o $@ $@.cpp $(TOOL_D)/fileutil.o
+ $(TOOL_D)/nreplace: $(TOOL_D)/nreplace.cpp $(TOOL_O)
+-	@CXX@ @CXXFLAGS@ -o $@ $@.cpp $(TOOL_D)/fileutil.o
++	@CXX_FOR_BUILD@ @CXXFLAGS_FOR_BUILD@ -o $@ $@.cpp $(TOOL_D)/fileutil.o
+ $(TOOL_D)/sec-test: $(TOOL_D)/sec-test.cpp $(TOOL_O)
+-	@CXX@ @CXXFLAGS@ -o $@ $@.cpp $(TOOL_O)
++	@CXX_FOR_BUILD@ @CXXFLAGS_FOR_BUILD@ -o $@ $@.cpp $(TOOL_O)
+ $(TOOL_D)/srccount: $(TOOL_D)/srccount.cpp $(TOOL_O)
+-	@CXX@ @CXXFLAGS@ -o $@ $@.cpp $(TOOL_D)/fileutil.o
++	@CXX_FOR_BUILD@ @CXXFLAGS_FOR_BUILD@ -o $@ $@.cpp $(TOOL_D)/fileutil.o
+ $(TOOL_D)/varrep: $(TOOL_D)/varrep.cpp $(TOOL_O)
+-	@CXX@ @CXXFLAGS@ -o $@ $@.cpp $(TOOL_O)
++	@CXX_FOR_BUILD@ @CXXFLAGS_FOR_BUILD@ -o $@ $@.cpp $(TOOL_O)
++$(TOOL_O): %.o: %.cpp
++	@CXX_FOR_BUILD@ @CXXFLAGS_FOR_BUILD@ -o $@ -c $<
+ 
+ include makefile.dep
+ makefile.dep: $(TOOL_D)/depbuild Makefile
+@@ -142,12 +148,12 @@
+ 	./autogen.sh --recheck
+ 
+ install:
+-	@INSTALL@ -d -m 0755 $(DESTDIR)/@prefix@/bin
+-	@INSTALL@ -m 0755 @ZSNESEXE@ $(DESTDIR)/@prefix@/bin
+-	@INSTALL@ -d -m 0755 $(DESTDIR)/@prefix@/man/man1
+-	@INSTALL@ -m 0644 linux/zsnes.1 $(DESTDIR)/@prefix@/man/man1
++	@INSTALL@ -d -m 0755 $(DESTDIR)/@bindir@
++	@INSTALL@ -m 0755 @ZSNESEXE@ $(DESTDIR)/@bindir@
++	@INSTALL@ -d -m 0755 $(DESTDIR)/@mandir@/man1
++	@INSTALL@ -m 0644 linux/zsnes.1 $(DESTDIR)/@mandir@/man1
+ uninstall:
+-	rm -f @prefix@/bin/$(notdir @ZSNESEXE@) @prefix@/man/man1/zsnes.1
++	rm -f $(DESTDIR)/@bindir@/$(notdir @ZSNESEXE@) $(DESTDIR)/@mandir@/man1/zsnes.1
+ 
+ clean:
+ 	rm -f $(Z_OBJS) $(PSR) $(PSR_H) @ZSNESEXE@
diff --git a/packages/addons/emulators/zsnes/url b/packages/addons/emulators/zsnes/url
new file mode 100644
index 0000000000..f17dc60c52
--- /dev/null
+++ b/packages/addons/emulators/zsnes/url
@@ -0,0 +1 @@
+http://prdownloads.sourceforge.net/zsnes/zsnes151src.tar.bz2
\ No newline at end of file