diff --git a/srcpkgs/procps-ng/template b/srcpkgs/procps-ng/template
index 37394b1406f..03e48ce5282 100644
--- a/srcpkgs/procps-ng/template
+++ b/srcpkgs/procps-ng/template
@@ -1,10 +1,10 @@
 # Template file for 'procps-ng'
 pkgname=procps-ng
 version=3.3.5
-revision=1
+revision=2
 wrksrc="procps-procps"
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--exec-prefix=/ --prefix=/usr --libdir=/usr/lib --disable-static"
 short_desc="Utilities for monitoring your system and its processes"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1"
@@ -17,6 +17,11 @@ replaces="procps>=0"
 makedepends="automake gettext-devel pkg-config ncurses-devel"
 crossmakedepends="ncurses-devel"
 
+if [ -n "$XBPS_CROSS_TRIPLET" ]; then
+	configure_args="${configure_args} ac_cv_func_malloc_0_nonnull=yes
+		ac_cv_func_realloc_0_nonnull=yes"
+fi
+
 pre_configure() {
 	echo ${version} > .tarball-version
 	./autogen.sh
@@ -26,9 +31,13 @@ post_install() {
 	vinstall ${FILESDIR}/sysctl.conf 644 etc
 
 	# provided by coreutils
-	rm ${DESTDIR}/usr/bin/kill
+	rm ${DESTDIR}/bin/kill
 	rm ${DESTDIR}/usr/share/man/man1/kill.1
 
+	vmove "bin/*" usr/bin
+	vmkdir usr/sbin
+	vmove "sbin/*" usr/sbin
+
 	# Create pidof symlink.
 	ln -sfr ${DESTDIR}/usr/bin/pgrep ${DESTDIR}/usr/bin/pidof