diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD
index 4f27314ed..a4d01454a 100644
--- a/extra/bind/PKGBUILD
+++ b/extra/bind/PKGBUILD
@@ -7,18 +7,29 @@
 #  - !makeflags - bind build doesn't like concurrency
 #  - build v6 as armv6kz
 
-pkgbase=bind
-pkgname=(bind bind-tools)
 _pkgver=9.16.5
+pkgname=bind
 pkgver=${_pkgver//-/.}
-pkgrel=1
+pkgrel=2
+pkgdesc='A complete, highly portable implementation of the DNS protocol'
 url='https://www.isc.org/software/bind/'
 license=('MPL2')
 arch=('x86_64')
 options=('!emptydirs' '!makeflags')
 makedepends=('libcap' 'libxml2' 'zlib' 'krb5' 'e2fsprogs' 'openssl' 'readline'
   'libidn2' 'dnssec-anchors' 'python' 'json-c' 'python-ply' 'lmdb' 'zlib' 'icu'
-  'xz' 'libmaxminddb' 'libnsl' 'libuv')
+  'xz' 'libmaxminddb' 'libnsl' 'libuv' 'python-sphinx')
+depends=('bash' 'dnssec-anchors' 'e2fsprogs' 'glibc' 'icu' 'libedit' 'json-c'
+  'krb5' 'libcap' 'libidn2' 'libmaxminddb' 'libnsl' 'libuv' 'libxml2' 'lmdb'
+  'openssl' 'python' 'python-ply' 'readline' 'xz' 'zlib')
+conflicts=('bind-tools' 'dnsutils')
+replaces=('bind-tools' 'dnsutils' 'host')
+provides=('bind-tools' 'dnsutils' 'dns-server')
+backup=('etc/named.conf'
+        'var/named/127.0.0.zone'
+        'var/named/localhost.zone'
+        'var/named/localhost.ip6.zone')
+install=bind.install
 validpgpkeys=('AE3FAC796711EC59FC007AA474BB6B9A4CBB3D38') #ISC Code Signing Key 2019 – 2020 (codesign@isc.org)
 source=("https://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.xz"{,.asc}
         'tmpfiles.conf'
@@ -79,23 +90,11 @@ build() {
   make
 }
 
-package_bind() {
-  pkgdesc='The ISC DNS Server'
-  provides=('dns-server')
-  depends=('glibc' 'libxml2' 'libcap' 'openssl' 'json-c' 'bind-tools' 'zlib'
-           'lmdb' 'libmaxminddb')
-  backup=('etc/named.conf'
-          'var/named/127.0.0.zone'
-          'var/named/localhost.zone'
-          'var/named/localhost.ip6.zone')
-  install=bind.install
-
+package() {
   cd "bind-$_pkgver"
   install -dm755 "$pkgdir/usr/share/licenses/$pkgname/"
   install -Dm644 LICENSE COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/"
-  for _d in bin/{check,named,rndc,plugins}; do
-    (cd "$_d" && make DESTDIR="$pkgdir" install)
-  done
+  make DESTDIR="$pkgdir" install
 
   cd "$srcdir"
   install -D -m644 tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
@@ -110,22 +109,4 @@ package_bind() {
   install -m640 -o 0 -g 40 127.0.0.zone "$pkgdir/var/named"
 }
 
-package_bind-tools() {
-  pkgdesc='The ISC DNS tools'
-  depends=('glibc' 'libcap' 'libxml2' 'zlib' 'krb5' 'e2fsprogs' 'python' 'bash'
-           'openssl' 'readline' 'libidn2' 'dnssec-anchors' 'json-c' 'lmdb' 'xz'
-           'icu' 'python-ply' 'libmaxminddb' 'libnsl' 'libuv')
-  conflicts=('dnsutils')
-  replaces=('dnsutils' 'host')
-  provides=("dnsutils=$pkgver")
-
-  cd "bind-$_pkgver"
-  install -Dm644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  make DESTDIR="$pkgdir" SUBDIRS="" install
-  (cd lib && make DESTDIR="$pkgdir" install)
-  for _d in bin/{confgen,dig,dnssec,delv,nsupdate,python,tools}; do
-    (cd "$_d" && make DESTDIR="$pkgdir" install)
-  done
-}
-
 # vim:set ts=2 sw=2 et: