diff --git a/srcpkgs/libnih/template b/srcpkgs/libnih/template
index c6bb5853741..5e775e04c42 100644
--- a/srcpkgs/libnih/template
+++ b/srcpkgs/libnih/template
@@ -1,9 +1,10 @@
 # Template file for 'libnih'
 pkgname=libnih
 version=1.0.3
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config"
+configure_args="--enable-threading"
+hostmakedepends="automake libtool gettext-devel pkg-config"
 makedepends="dbus-devel"
 short_desc="Small library for C application development"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -12,6 +13,17 @@ homepage="https://launchpad.net/libnih"
 distfiles="http://launchpad.net/libnih/${version%.*}/${version}/+download/libnih-${version}.tar.gz"
 checksum=897572df7565c0a90a81532671e23c63f99b4efde2eecbbf11e7857fbc61f405
 
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" libnih"
+fi
+
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		configure_args+=" NIH_DBUS_TOOL=/usr/bin/nih-dbus-tool"
+	fi
+	autoreconf -fi
+}
+
 libnih-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}-${version}_${revision}"