diff --git a/common/shlibs b/common/shlibs
index dffa86bc30c..4420fdd0855 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -918,6 +918,8 @@ libnilfscleaner.so.0 libnilfs-2.1.0_1
 libchicken.so.7 libchicken-4.9.0_1
 libmdb.so.0 libmdb-0.5_1
 libmdbsql.so.0 libmdb-0.5_1
+libkeybinder.so libkeybinder2-0.3.0_1
+libkeybinder.so.0 libkeybinder2-0.3.0_1
 libkmod.so.2 libkmod-5_1
 libestr.so.0 libestr-0.1.2_1
 libee.so.0 libee-0.3.2_1
diff --git a/srcpkgs/kupfer/patches/settings.patch b/srcpkgs/kupfer/patches/settings.patch
new file mode 100644
index 00000000000..7c38e7fb9a6
--- /dev/null
+++ b/srcpkgs/kupfer/patches/settings.patch
@@ -0,0 +1,23 @@
+diff -aur kupfer-v208/kupfer/core/settings.py 
+kupfer-v208.modified/kupfer/core/settings.py
+--- kupfer-v208/kupfer/core/settings.py 2012-06-01 10:51:14.000000000 -0700
++++ kupfer-v208.modified/kupfer/core/settings.py	2012-11-21 14:48:11.876592441 
+-0800
+@@ -393,6 +393,8 @@
+		"""
+		Get a list of (id_, name) tuples for the given @category_key
+		"""
++		if not category_key in self._alternative_validators:
++			return
+		validator = self._alternative_validators[category_key]
+		for (id_, alternative) in self._alternatives[category_key].iteritems():
+			name = alternative["name"]
+@@ -400,7 +402,8 @@
+				yield (id_, name)
+ 
+	def get_all_alternatives(self, category_key):
+-		return self._alternatives[category_key]
++		if category_key in self._alternatives:
++			return self._alternatives[category_key]
+ 
+	def get_preferred_alternative(self, category_key):
diff --git a/srcpkgs/kupfer/template b/srcpkgs/kupfer/template
index 52af1c74b87..ff91e1ee122 100644
--- a/srcpkgs/kupfer/template
+++ b/srcpkgs/kupfer/template
@@ -1,10 +1,11 @@
 # Template file for 'kupfer'
 pkgname=kupfer
 version=208
-revision=2
+revision=3
+patch_args="-Np1"
 build_style=waf
 hostmakedepends="perl intltool"
-makedepends="python python-gobject2 pygtk python-xdg python-dbus"
+makedepends="python python-gobject2 pygtk python-xdg python-dbus python-keybinder2"
 depends="$makedepends"
 short_desc="Interface for quick and convenient access to applications"
 maintainer="Enno Boland <eb@s01.de>"
diff --git a/srcpkgs/libkeybinder2-devel b/srcpkgs/libkeybinder2-devel
new file mode 120000
index 00000000000..d6223465b4f
--- /dev/null
+++ b/srcpkgs/libkeybinder2-devel
@@ -0,0 +1 @@
+libkeybinder2
\ No newline at end of file
diff --git a/srcpkgs/libkeybinder2/template b/srcpkgs/libkeybinder2/template
new file mode 100644
index 00000000000..2c9413b63ff
--- /dev/null
+++ b/srcpkgs/libkeybinder2/template
@@ -0,0 +1,49 @@
+pkgname=libkeybinder2
+version=0.3.0
+revision=1
+build_style=gnu-configure
+build_options="gir"
+configure_args="$(vopt_enable gir introspection)"
+hostmakedepends="automake libtool pkg-config intltool gnome-common gtk-doc"
+makedepends="pygtk-devel $(vopt_if gir gobject-introspection)"
+short_desc="Library for registering global keyboard shortcuts (GTK+2)"
+maintainer="ShadowKyogre <shadowkyogre.public@gmail.com>"
+homepage="https://github.com/engla/keybinder"
+license="GPL-2"
+distfiles="https://github.com/engla/keybinder/archive/v${version}.tar.gz"
+checksum=8e8d77386b9e29556fab097c31aec643d36a33d201733b7b999179abcba7774e
+wrksrc=keybinder-${version}
+
+# Disable gir for cross builds.
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="gir"
+fi
+
+pre_configure() {
+	./autogen.sh
+}
+
+libkeybinder2-devel_package()
+{
+	depends="pygtk-devel ${sourcepkg}-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install()
+	{
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+		fi
+	}
+}
+
+python-keybinder2_package()
+{
+	depends="pygtk"
+	short_desc+=" - python module"
+	pkg_install()
+	{
+		vmove usr/lib/python2.7
+	}
+}
diff --git a/srcpkgs/python-keybinder2 b/srcpkgs/python-keybinder2
new file mode 120000
index 00000000000..d6223465b4f
--- /dev/null
+++ b/srcpkgs/python-keybinder2
@@ -0,0 +1 @@
+libkeybinder2
\ No newline at end of file