diff --git a/srcpkgs/jack/jack-devel.template b/srcpkgs/jack/jack-devel.template
index 077efc785c7..ec0445bdb37 100644
--- a/srcpkgs/jack/jack-devel.template
+++ b/srcpkgs/jack/jack-devel.template
@@ -1,14 +1,13 @@
 # Template file for 'jack-devel'.
 #
-depends="libsamplerate-devel alsa-lib-devel libsndfile-devel celt-devel libjack"
+noarch=yes
+depends="libjack>=${version}"
 short_desc="${short_desc} (Development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
-do_install()
-{
+do_install() {
         vmove usr/include usr
         vmove usr/lib/pkgconfig usr/lib
 }
diff --git a/srcpkgs/jack/libjack.template b/srcpkgs/jack/libjack.template
index d1a40bf8749..9dbf7516dc1 100644
--- a/srcpkgs/jack/libjack.template
+++ b/srcpkgs/jack/libjack.template
@@ -1,14 +1,11 @@
 # Template file for 'libjack'.
 #
-depends="dbus-libs"
 short_desc="${short_desc} (Runtime library)"
 long_desc="${long_desc}
 
  This package contains the JACK runtime lib(s)."
 
-
-do_install()
-{
+do_install() {
 	vmove "usr/lib/*.so*" usr/lib
 	vmove usr/lib/jack usr/lib
 }
diff --git a/srcpkgs/jack/template b/srcpkgs/jack/template
index e8400badc13..8807e278132 100644
--- a/srcpkgs/jack/template
+++ b/srcpkgs/jack/template
@@ -1,19 +1,19 @@
 # Template file for 'jack'
 pkgname=jack
-version=1.9.8
-build_wrksrc=${pkgname}-${version}
+version=1.9.9.5
 build_style=waf
-revision=2
+revision=1
 configure_args="--alsa --classic --dbus"
 # XXX libffado (firewire)
-subpackages="lib$pkgname $pkgname-devel"
-makedepends="python pkg-config libsamplerate-devel readline-devel ncurses-devel alsa-lib-devel dbus-devel expat-devel libsndfile-devel celt-devel"
+subpackages="libjack jack-devel"
+makedepends="python pkg-config libsamplerate-devel readline-devel
+ alsa-lib-devel dbus-devel expat-devel libsndfile-devel celt-devel"
 short_desc="JACK Audio Connection Kit low-latency sound server (pro audio)"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2, LGPL-2.1"
 homepage="http://jackaudio.org/"
-distfiles="http://www.grame.fr/~letz/${pkgname}-${version}.tgz"
-checksum=4c712eac54bdf5b4c0245f728654459d0437e5cdab84e7ac633be6fe4502081d
+distfiles="https://dl.dropbox.com/u/28869550/jack-${version}.tar.bz2"
+checksum=65ef5acceabb1ebd4ac8c437be47a522292e3c2a1f7bfa656de7392d9351ebbd
 long_desc="
  JACK is system for handling real-time, low latency audio (and MIDI). It runs
  on GNU/Linux, Solaris, FreeBSD, OS X and Windows (and can be ported to other