diff --git a/packages/RPi-Lakka/package.mk b/packages/RPi-Lakka/package.mk
index 6bbb3d386d7..8019996aef8 100644
--- a/packages/RPi-Lakka/package.mk
+++ b/packages/RPi-Lakka/package.mk
@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/Niouby/OpenELEC.tv"
 PKG_URL=""
-PKG_DEPENDS="RetroArch dosbox dinothawr prboom mednafen-pce fba pcsx_rearmed scummvm handy picodrive pocketsnes genesis-plus-gx nxengine fceu-next gambatte stella imame4all vbam mednafen-gba vba-next meteor nestopia quicknes libretro-ffmpeg retroarch-joypad-autoconfig core-info"
+PKG_DEPENDS="RetroArch snes9x-next dosbox dinothawr prboom mednafen-pce fba pcsx_rearmed scummvm handy picodrive pocketsnes genesis-plus-gx nxengine fceu-next gambatte stella imame4all vbam mednafen-gba vba-next meteor nestopia quicknes libretro-ffmpeg retroarch-joypad-autoconfig core-info"
 PKG_BUILD_DEPENDS=""
 PKG_PRIORITY="optional"
 PKG_SECTION="virtual"
diff --git a/packages/RPi-Lakka/snes9x-next/package.mk b/packages/RPi-Lakka/snes9x-next/package.mk
new file mode 100644
index 00000000000..f678b9a4c7e
--- /dev/null
+++ b/packages/RPi-Lakka/snes9x-next/package.mk
@@ -0,0 +1,45 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="snes9x-next"
+PKG_VERSION="615b8a1"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="Non-commercial"
+PKG_SITE="https://github.com/libretro/snes9x-next"
+PKG_URL="$LAKKA_MIRROR/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS_TARGET="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="RetroArch"
+PKG_SHORTDESC="Optimized port/rewrite of SNES9x 1.52+ to Libretro."
+PKG_LONGDESC="Optimized port/rewrite of SNES9x 1.52+ to Libretro."
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+make_target() {
+  make -f Makefile.libretro
+}
+
+makeinstall_target() {
+  mkdir -p $INSTALL/usr/lib/libretro
+  cp snes9x_next_libretro.so $INSTALL/usr/lib/libretro/
+}
diff --git a/tools/mkpkg/mkpkg_snes9x-next b/tools/mkpkg/mkpkg_snes9x-next
new file mode 100755
index 00000000000..a2c11688a9d
--- /dev/null
+++ b/tools/mkpkg/mkpkg_snes9x-next
@@ -0,0 +1,44 @@
+#!/bin/sh
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+echo "getting sources..."
+  if [ ! -d snes9x-next.git ]; then
+    git clone https://github.com/libretro/snes9x-next.git -b master snes9x-next.git
+  fi
+
+  cd snes9x-next.git
+    git pull
+    GIT_REV=`git log -n1 --format=%h`
+  cd ..
+
+echo "copying sources..."
+  rm -rf snes9x-next-$GIT_REV
+  cp -R snes9x-next.git snes9x-next-$GIT_REV
+
+echo "cleaning sources..."
+  rm -rf snes9x-next-$GIT_REV/.git
+  rm snes9x-next-$GIT_REV/.gitignore
+
+echo "packing sources..."
+  tar cvJf snes9x-next-$GIT_REV.tar.xz snes9x-next-$GIT_REV
+
+echo "remove temporary sourcedir..."
+  rm -rf snes9x-next-$GIT_REV