diff --git a/games-emulation/libretro-snes9x/metadata.xml b/games-emulation/libretro-snes9x/metadata.xml
index b5284b7ac1000..8edc252a67719 100644
--- a/games-emulation/libretro-snes9x/metadata.xml
+++ b/games-emulation/libretro-snes9x/metadata.xml
@@ -7,6 +7,6 @@
     </maintainer>
     <longdescription>Snes9x libretro port</longdescription>
     <upstream>
-        <remote-id type="github">libretro/libretro-snes9x</remote-id>
+        <remote-id type="github">libretro/snes9x</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-9999.ebuild b/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-9999.ebuild
new file mode 100644
index 0000000000000..a3c02f28e235d
--- /dev/null
+++ b/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Snes9x GameClient for Kodi"
+HOMEPAGE="https://github.com/kodi-game/game.libretro.snes9x"
+SRC_URI=""
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-game/game.libretro.snes9x.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-game/game.libretro.snes9x/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/game.libretro.snes9x-${PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	~media-tv/kodi-9999
+	games-emulation/libretro-snes9x
+	"
+RDEPEND="
+	media-plugins/kodi-game-libretro
+	${DEPEND}
+	"
+src_prepare() {
+	echo 'find_library(SNES9X_LIB NAMES snes9x_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-snes9x.cmake" || die
+	default
+}
diff --git a/media-plugins/kodi-game-libretro-snes9x/metadata.xml b/media-plugins/kodi-game-libretro-snes9x/metadata.xml
new file mode 100644
index 0000000000000..a1ae2f1a84ca1
--- /dev/null
+++ b/media-plugins/kodi-game-libretro-snes9x/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>candrews@gentoo.org</email>
+        <name>Craig Andrews</name>
+    </maintainer>
+    <longdescription>Snes9x GameClient for Kodi</longdescription>
+    <upstream>
+        <remote-id type="github">kodi-game/game.libretro.snes9x</remote-id>
+    </upstream>
+</pkgmetadata>