diff --git a/srcpkgs/jack/template b/srcpkgs/jack/template
index 333231838d9..8664d9cb24c 100644
--- a/srcpkgs/jack/template
+++ b/srcpkgs/jack/template
@@ -1,12 +1,7 @@
 # Template file for 'jack'
 pkgname=jack
 version=1.9.9.5
-build_style=waf
-revision=2
-configure_args="--alsa --classic --dbus"
-# XXX libffado (firewire)
-makedepends="python pkg-config libsamplerate-devel readline-devel
- dbus-devel celt-devel"
+revision=3
 short_desc="JACK Audio Connection Kit low-latency sound server (pro audio)"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2, LGPL-2.1"
@@ -27,7 +22,25 @@ long_desc="
  design focuses on two key areas: synchronous execution of all clients, and
  low latency operation."
 
-post_install() {
+# XXX libffado (firewire)
+hostmakedepends="pkg-config python"
+makedepends="libsamplerate-devel readline-devel dbus-devel celt-devel"
+
+do_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/usr/lib/pkgconfig"
+		export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
+	fi
+	python waf configure --prefix=/usr --alsa --classic --dbus
+}
+
+do_build() {
+	python waf build ${makejobs}
+}
+
+do_install() {
+	python waf install --destdir=${DESTDIR}
+
 	# pam_limits(8) support
 	vinstall ${FILESDIR}/jack-limitsd.conf \
 		644 etc/security/limits.d jack.conf
@@ -37,7 +50,7 @@ post_install() {
 }
 
 libjack_package() {
-	short_desc="${short_desc} -- runtime library"
+	short_desc+=" - runtime library"
 	pkg_install() {
 		vmove "usr/lib/*.so*"
 		vmove usr/lib/jack
@@ -46,7 +59,7 @@ libjack_package() {
 
 jack-devel_package() {
 	depends="libjack>=${version}"
-	short_desc="${short_desc} -- development files"
+	short_desc+=" - development files"
 	pkg_install() {
         	vmove usr/include
         	vmove usr/lib/pkgconfig
@@ -55,7 +68,6 @@ jack-devel_package() {
 
 jack_package() {
 	pkg_install() {
-		vmove etc
-		vmove usr
+		vmove all
 	}
 }