diff --git a/gentoo/sys-apps/uinput-mapper/uinput-mapper-9999.ebuild b/gentoo/sys-apps/uinput-mapper/uinput-mapper-9999.ebuild
new file mode 100644
index 0000000..16b3465
--- /dev/null
+++ b/gentoo/sys-apps/uinput-mapper/uinput-mapper-9999.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+PYTHON_DEPEND="2:2.5"
+
+inherit eutils git-2 python
+
+DESCRIPTION="uinput-mapper, create and modify input devices"
+HOMEPAGE="http://hetgrotebos.org/wiki/uinput-mapper"
+SRC_URI=""
+
+EGIT_REPO_URI="git://github.com/MerlijnWajer/uinput-mapper"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	git-2_src_unpack
+}
+
+src_compile() {
+	emake
+}
+
+src_install() {
+	insinto "$(python_get_sitedir)"/uinputmapper
+	doins uinputmapper/*.py
+
+	exeinto /usr/bin
+
+	doexe input-read
+	doexe input-create
+}
+
diff --git a/input-create b/input-create
index 770edd0..06e25db 100755
--- a/input-create
+++ b/input-create
@@ -3,8 +3,8 @@ import ctypes, fcntl, os, sys
 
 import uinputmapper
 import uinputmapper.linux_uinput
-from uinputmappercinput import *
-from uinputmappermapper import KeyMapper, parse_conf, pretty_conf_print, \
+from uinputmapper.cinput import *
+from uinputmapper.mapper import KeyMapper, parse_conf, pretty_conf_print, \
     get_exported_device_count
 from uinputmapper.linux_input import timeval, input_event