diff --git a/srcpkgs/bind/bind-devel.template b/srcpkgs/bind/bind-devel.template
index e0585040d5..21f09c2867 100644
--- a/srcpkgs/bind/bind-devel.template
+++ b/srcpkgs/bind/bind-devel.template
@@ -1,12 +1,12 @@
 # Template file for 'bind-devel'.
 #
-depends="bind-libs"
+noarch=yes
+depends="bind-libs>=$version"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains development files, static files, headers, etc."
 
-
 do_install() {
 	vmove usr/bin/isc-config.sh usr/bin
 	vmove usr/share/man/man1/isc-config.sh.1 usr/share/man/man1
diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index e7739515c9..a1f309813c 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,30 +1,32 @@
 # Template file for 'bind'
 pkgname=bind
-version=9.9.1
-homepage="http://www.isc.org/software/bind/"
-distfiles="http://ftp.isc.org/isc/bind9/${version}/bind-${version}.tar.gz"
+_distver=9.9.1
+_patchver=P1
+version="${_distver}.${_patchver}"
+wrksrc="bind-${_distver}-${_patchver}"
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --with-openssl --with-libxml2
 --enable-threads --enable-largefile --enable-ipv6 --with-libtool
 --enable-atomic --sysconfdir=/etc/named"
 makedepends="perl>=0 openssl-devel mit-krb5-devel libxml2-devel libcap-devel"
-revision=1
 short_desc="Berkeley Internet Name Domain server"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="ISC"
-checksum=7599ae5a7d945707926019a6b191d06775e9657c68ced00e09af5bc751dad524
+homepage="http://www.isc.org/software/bind/"
+distfiles="http://ftp.isc.org/isc/bind9/${version}/bind-${_distver}-${_patchver}.tar.gz"
+checksum=2dc5886b3eb6768d312b43dbe1e23a5b67b4f4dcfa1a65b1017e7710bb764627
 long_desc="
  BIND is by far the most widely used DNS software on the Internet. It provides
  a robust and stable platform on top of which organizations can build
  distributed computing systems with the knowledge that those systems are fully
  compliant with published DNS standards."
 
-subpackages="bind-libs bind-utils bind-devel"
-
 make_dirs="
 /var/named	0770	root	named
 /var/run/named	0770	root	named"
 
+subpackages="bind-libs bind-utils bind-devel"
 systemd_services="named.service true"
 conf_files="/etc/named/named.conf"
 system_accounts="named"
@@ -32,7 +34,6 @@ named_desc="BIND DNS server"
 named_homedir="/var/named"
 named_shell="/bin/false"
 
-
 post_install() {
 	vinstall ${FILESDIR}/named.service 644 lib/systemd/system
 	vinstall ${FILESDIR}/named.logrotate 600 etc/logrotate.d named