diff --git a/srcpkgs/libkeybinder2/template b/srcpkgs/libkeybinder2/template
index 2c9413b63ff..8bae83696bd 100644
--- a/srcpkgs/libkeybinder2/template
+++ b/srcpkgs/libkeybinder2/template
@@ -1,10 +1,12 @@
+# Template file for 'libkeybinder2'
 pkgname=libkeybinder2
 version=0.3.0
-revision=1
+revision=2
+wrksrc="keybinder-${version}"
 build_style=gnu-configure
 build_options="gir"
 configure_args="$(vopt_enable gir introspection)"
-hostmakedepends="automake libtool pkg-config intltool gnome-common gtk-doc"
+hostmakedepends="automake libtool pkg-config intltool gnome-common gtk-doc pygtk-devel"
 makedepends="pygtk-devel $(vopt_if gir gobject-introspection)"
 short_desc="Library for registering global keyboard shortcuts (GTK+2)"
 maintainer="ShadowKyogre <shadowkyogre.public@gmail.com>"
@@ -12,7 +14,6 @@ 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
@@ -20,17 +21,18 @@ if [ -z "$CROSS_BUILD" ]; then
 fi
 
 pre_configure() {
-	./autogen.sh
+	NOCONFIGURE=1 ./autogen.sh
+	if [ "$CROSS_BUILD" ]; then
+		sed -i "s,PYTHON_INCLUDES=.*,PYTHON_INCLUDES=-I${XBPS_CROSS_BASE}/usr/include/python2.7,g" configure
+	fi
 }
 
-libkeybinder2-devel_package()
-{
-	depends="pygtk-devel ${sourcepkg}-${version}_${revision}"
+libkeybinder2-devel_package() {
+	depends="pygtk-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
-	pkg_install()
-	{
+	pkg_install() {
 		vmove usr/include
-		vmove "usr/lib/*.so"
+		vmove usr/lib/*.so
 		vmove usr/lib/pkgconfig
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
@@ -38,12 +40,10 @@ libkeybinder2-devel_package()
 	}
 }
 
-python-keybinder2_package()
-{
+python-keybinder2_package() {
 	depends="pygtk"
-	short_desc+=" - python module"
-	pkg_install()
-	{
+	short_desc+=" - Python bindings"
+	pkg_install() {
 		vmove usr/lib/python2.7
 	}
 }