diff --git a/srcpkgs/bind/patches/cross.patch b/srcpkgs/bind/patches/cross.patch
new file mode 100644
index 00000000000..98db94a6284
--- /dev/null
+++ b/srcpkgs/bind/patches/cross.patch
@@ -0,0 +1,47 @@
+Detect ECDSA by checking header existence.
+
+--- configure.in.orig	2013-04-23 07:13:02.191893497 +0200
++++ configure.in	2013-04-23 07:27:48.630090319 +0200
+@@ -766,36 +766,13 @@ esac
+ 		AC_CHECK_FUNCS(EVP_sha256 EVP_sha384 EVP_sha512)
+ 
+ 		AC_MSG_CHECKING(for OpenSSL ECDSA support)
+-		have_ecdsa=""
+-		AC_TRY_RUN([
+-#include <stdio.h>
+-#include <openssl/ecdsa.h>
+-#include <openssl/objects.h>
+-int main() {
+-	EC_KEY *ec256, *ec384;
+-
+-#if !defined(HAVE_EVP_SHA256) || !defined(HAVE_EVP_SHA384)
+-	return (1);
+-#endif
+-	ec256 = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
+-	ec384 = EC_KEY_new_by_curve_name(NID_secp384r1);
+-	if (ec256 == NULL || ec384 == NULL)
+-		return (2);
+-	return (0);
+-}
+-],
+-		[AC_MSG_RESULT(yes)
+-		have_ecdsa="yes"],
+-		[AC_MSG_RESULT(no)
+-		have_ecdsa="no"])
+-		case $have_ecdsa in
+-		yes)
+-			OPENSSL_ECDSA="yes"
++		if test -f $use_openssl/include/openssl/ecdsa.h
++		then
+ 			AC_DEFINE(HAVE_OPENSSL_ECDSA)
+-			;;
+-		*)
+-			;;
+-		esac
++			AC_MSG_RESULT(yes)
++		else
++			AC_MSG_RESULT(no)
++		fi
+ 
+ 		AC_MSG_CHECKING(for OpenSSL GOST support)
+ 		have_gost=""
diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index d2f76987c72..4c857c6bec9 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,30 +1,61 @@
 # Template file for 'bind'
 pkgname=bind
 _distver=9.9.2
-_patchver=P1
+_patchver=P2
 version="${_distver}.${_patchver}"
 wrksrc="bind-${_distver}-${_patchver}"
-revision=2
-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"
-hostmakedepends="perl"
-makedepends="openssl-devel mit-krb5-devel libxml2-devel
- libcap-devel readline-devel"
+revision=1
 short_desc="Berkeley Internet Name Domain server"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="ISC"
 homepage="http://www.isc.org/software/bind/"
 distfiles="http://ftp.isc.org/isc/bind9/${_distver}-${_patchver}/bind-${_distver}-${_patchver}.tar.gz"
-checksum=4bce7c020402623333b655be5167ae8c52f30a6bfe9750caa3ab70da7d90219c
+checksum=ff822734e3550969251411e20f6f7397d14a912613a42af423752e93fdb565d2
 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."
 
-post_install() {
+hostmakedepends="automake libtool perl"
+makedepends="openssl-devel mit-krb5-devel libxml2-devel
+ libcap-devel readline-devel"
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" libxml2-devel"
+fi
+
+pre_configure() {
+	# disable bin tests for now.
+	sed -e "s,tests,,g" -i bin/Makefile.in
+	rm -f aclocal.m4 libtool
+	autoreconf -fi
+}
+
+do_configure() {
+	local args
+
+	if [ "$CROSS_BUILD" ]; then
+		args="--with-openssl=$XBPS_CROSS_BASE
+			--with-gssapi=$XBPS_CROSS_BASE
+			--with-libxml2=$XBPS_CROSS_BASE
+			BUILD_CC=cc BUILD_CFLAGS=-Os"
+	fi
+
+	./configure ${CONFIGURE_SHARED_ARGS} --disable-static \
+		--enable-threads --enable-largefile \
+		--with-libtool --enable-atomic --sysconfdir=/etc/named \
+		--enable-epoll --with-gost=no --enable-ipv6 \
+		--with-randomdev=/dev/urandom ${args}
+}
+
+do_build() {
+	make ${makejobs}
+}
+
+do_install() {
+	make DESTDIR=$DESTDIR install
+
 	vinstall ${FILESDIR}/named.service 644 usr/lib/systemd/system
 	vinstall ${FILESDIR}/named.logrotate 600 etc/logrotate.d named
 	vinstall ${FILESDIR}/named.conf 640 etc/named
@@ -35,14 +66,14 @@ post_install() {
 }
 
 bind-libs_package() {
-	short_desc="${short_desc} - Runtime libraries"
+	short_desc="Berkeley Internet Name Domain server - Runtime libraries"
 	pkg_install() {
 		vmove "usr/lib/*.so*"
 	}
 }
 
 bind-utils_package() {
-	short_desc="${short_desc} - DNS utils"
+	short_desc="Berkeley Internet Name Domain server - DNS utils"
 	pkg_install() {
 		for f in dig host nslookup; do
 			vmove usr/bin/${f}
@@ -53,7 +84,7 @@ bind-utils_package() {
 
 bind-devel_package() {
 	depends="bind-libs>=$version"
-	short_desc="${short_desc} - development files"
+	short_desc="Berkeley Internet Name Domain server - development files"
 	pkg_install() {
 		vmove usr/bin/isc-config.sh
 		vmove usr/share/man/man1/isc-config.sh.1
@@ -70,8 +101,8 @@ bind_package() {
 	named_homedir="/var/named"
 	named_shell="/bin/false"
 	make_dirs="/var/named 0770 root named"
+	depends="shadow"
 	pkg_install() {
-		vmove etc
-		vmove usr
+		vmove all
 	}
 }