diff --git a/srcpkgs/kmod/libkmod-devel.template b/srcpkgs/kmod/libkmod-devel.template
index c8dfaf0b0d..e17c0f7ef8 100644
--- a/srcpkgs/kmod/libkmod-devel.template
+++ b/srcpkgs/kmod/libkmod-devel.template
@@ -1,12 +1,8 @@
 # Template file for 'libkmod-devel'.
 #
-depends="zlib-devel libkmod"
+depends="zlib-devel libkmod>=${version}"
 short_desc="${short_desc} - development files"
-long_desc="${long_desc}
-
- This package contains the files needed for developing applications
- that use libkmod."
-
+noarch=yes
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/kmod/libkmod.template b/srcpkgs/kmod/libkmod.template
index 13595a459b..78d17e5b27 100644
--- a/srcpkgs/kmod/libkmod.template
+++ b/srcpkgs/kmod/libkmod.template
@@ -1,9 +1,6 @@
 # Template file for 'libkmod'.
 #
 short_desc="${short_desc} - runtime shared library"
-long_desc="${long_desc}
-
- This package provides the libkmod runtime shared library."
 
 do_install() {
 	vmove "usr/lib/*.so*" usr/lib
diff --git a/srcpkgs/kmod/template b/srcpkgs/kmod/template
index e717814df1..a13074ef5b 100644
--- a/srcpkgs/kmod/template
+++ b/srcpkgs/kmod/template
@@ -1,7 +1,7 @@
 # Template file for 'kmod'
 pkgname=kmod
 version=12
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-zlib --with-xz"
 makedepends="pkg-config zlib-devel liblzma-devel libxslt"
@@ -14,11 +14,6 @@ license="GPL-2"
 homepage="http://git.profusion.mobi/cgit.cgi/kmod.git"
 distfiles="${KERNEL_SITE}/utils/kernel/kmod/kmod-${version}.tar.xz"
 checksum=c6189dd8c5a1e8d9224e8506bd188c0cd5dfa119fd6b7e5869b3640cbe8bf92f
-long_desc="
- kmod is a set of tools to handle common tasks with Linux kernel modules like
- insert, remove, list, check properties, resolve dependencies and aliases.
-
- These tools are designed on top of libkmod, a library that is shipped with kmod."
 
 make_dirs="
 /etc/depmod.d 0755 root root
@@ -26,6 +21,17 @@ make_dirs="
 /usr/lib/depmod.d 0755 root root
 /usr/lib/modprobe.d 0755 root root"
 
+if [ -n "$XBPS_CROSS_TRIPLET" ]; then
+	makedepends="automake pkg-config libxslt"
+	crossmakedepends="zlib-devel liblzma-devel"
+	configure_args="${configure_args}
+		PKG_CONFIG_SYSROOT_DIR=/usr/$XBPS_CROSS_TRIPLET
+		PKG_CONFIG_LIBDIR=/usr/$XBPS_CROSS_TRIPLET/lib/pkgconfig"
+	pre_configure() {
+		autoreconf -fi
+	}
+fi
+
 post_install() {
 	vinstall ${FILESDIR}/depmod-search.conf 644 usr/lib/depmod.d search.conf
 	# Add compatibility symlinks.