diff --git a/srcpkgs/keyutils/template b/srcpkgs/keyutils/template
index 51de41ff903..245e3bf39c9 100644
--- a/srcpkgs/keyutils/template
+++ b/srcpkgs/keyutils/template
@@ -1,8 +1,7 @@
 # Template file for 'keyutils'
 pkgname=keyutils
 version=1.5.5
-revision=1
-build_style=gnu-makefile
+revision=2
 short_desc="Linux Key Management Utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.kernel.org"
@@ -13,11 +12,14 @@ long_desc="
  These tools are used to control the key management system built into the
  Linux kernel."
 
-pre_build() {
-	sed -i "s|/lib64|/lib|g" Makefile
+do_build() {
+	sed -e "s|/lib64|/lib|g;s|-m64|${CFLAGS}|g" -i Makefile
+	make ${makejobs}
 }
 
-post_install() {
+do_install() {
+	make DESTDIR=${DESTDIR} install
+
 	vmkdir usr/lib
 	vmkdir usr/bin
 	vmkdir usr/sbin
@@ -30,7 +32,7 @@ post_install() {
 }
 
 libkeyutils_package() {
-	short_desc="${short_desc} -- runtime library"
+	short_desc+=" - runtime library"
 	pkg_install() {
 		vmove "usr/lib/*.so*"
 	}
@@ -38,7 +40,7 @@ libkeyutils_package() {
 
 keyutils-devel_package() {
 	depends="libkeyutils>=${version}"
-	short_desc="${short_desc} -- development files"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"
@@ -49,7 +51,6 @@ keyutils-devel_package() {
 keyutils_package() {
 	conf_files="/etc/request-key.conf"
 	pkg_install() {
-		vmove etc
-		vmove usr
+		vmove all
 	}
 }