diff --git a/extra/bind/.SRCINFO b/extra/bind/.SRCINFO
index a4e0f4964..57adf7e90 100644
--- a/extra/bind/.SRCINFO
+++ b/extra/bind/.SRCINFO
@@ -1,11 +1,13 @@
 pkgbase = bind
 	pkgdesc = A complete, highly portable implementation of the DNS protocol
 	pkgver = 9.20.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.isc.org/software/bind/
 	install = bind.install
 	arch = x86_64
 	license = MPL2
+	makedepends = git
+	makedepends = python-sphinx
 	depends = bash
 	depends = dnssec-anchors
 	depends = e2fsprogs
@@ -41,8 +43,7 @@ pkgbase = bind
 	backup = var/named/127.0.0.zone
 	backup = var/named/localhost.zone
 	backup = var/named/localhost.ip6.zone
-	source = https://ftp.isc.org/isc/bind9/9.20.3/bind-9.20.3.tar.xz
-	source = https://ftp.isc.org/isc/bind9/9.20.3/bind-9.20.3.tar.xz.asc
+	source = git+https://gitlab.isc.org/isc-projects/bind9.git#tag=v9.20.3
 	source = tmpfiles.conf
 	source = sysusers.conf
 	source = named.conf
@@ -50,10 +51,7 @@ pkgbase = bind
 	source = localhost.zone
 	source = localhost.ip6.zone
 	source = 127.0.0.zone
-	validpgpkeys = D99CCEAF879747014F038D63182E23579462EFAA
-	validpgpkeys = 706B6C28620E76F91D11F7DF510A642A06C52CEC
-	sha256sums = f90c2da1621299f56a2e6585a6fe459ec3efd6f2fdf84a8fbf31b40be7698a73
-	sha256sums = SKIP
+	sha256sums = e71ea81ec264124eb66e4166ed505285cd1073705f7ed7589331a4352af35f22
 	sha256sums = f0423c4ee8495da487e07e9144bec1d25f46a0cd2dfa7cfd7a761ef15bfefc98
 	sha256sums = 7c0acefcfcc3ae093550caed7ec90fe84bec8f7477459ffa7e71dda76bcbdb2c
 	sha256sums = e08a01d41b18bdb771d534daca99642314939aafdb088e5cfcf0ef2d33f8e7eb
diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD
index 402b5c6d7..d1156a039 100644
--- a/extra/bind/PKGBUILD
+++ b/extra/bind/PKGBUILD
@@ -9,7 +9,7 @@
 
 pkgname=bind
 pkgver=9.20.3
-pkgrel=1
+pkgrel=2
 pkgdesc='A complete, highly portable implementation of the DNS protocol'
 url='https://www.isc.org/software/bind/'
 license=('MPL2')
@@ -18,6 +18,7 @@ options=('!emptydirs' '!makeflags')
 depends=('bash' 'dnssec-anchors' 'e2fsprogs' 'glibc' 'icu' 'libedit' 'json-c'
   'krb5' 'libcap' 'libidn2' 'libmaxminddb' 'libnsl' 'libuv' 'libxml2' 'lmdb'
   'openssl' 'readline' 'xz' 'zlib' 'jemalloc' 'libnghttp2' 'liburcu')
+makedepends=('git' 'python-sphinx')
 conflicts=('bind-tools' 'dnsutils')
 replaces=('bind-tools' 'dnsutils' 'host')
 provides=('bind-tools' 'dnsutils' 'dns-server')
@@ -26,9 +27,7 @@ backup=('etc/named.conf'
         'var/named/localhost.zone'
         'var/named/localhost.ip6.zone')
 install=bind.install
-validpgpkeys=('D99CCEAF879747014F038D63182E23579462EFAA'  # Michal Nowak
-              '706B6C28620E76F91D11F7DF510A642A06C52CEC') # Michał Kępień
-source=("https://ftp.isc.org/isc/bind9/${pkgver}/bind-${pkgver}.tar.xz"{,.asc}
+source=("git+https://gitlab.isc.org/isc-projects/bind9.git#tag=v${pkgver}"
         'tmpfiles.conf'
         'sysusers.conf'
         'named.conf'
@@ -36,8 +35,7 @@ source=("https://ftp.isc.org/isc/bind9/${pkgver}/bind-${pkgver}.tar.xz"{,.asc}
         'localhost.zone'
         'localhost.ip6.zone'
         '127.0.0.zone')
-sha256sums=('f90c2da1621299f56a2e6585a6fe459ec3efd6f2fdf84a8fbf31b40be7698a73'
-            'SKIP'
+sha256sums=('e71ea81ec264124eb66e4166ed505285cd1073705f7ed7589331a4352af35f22'
             'f0423c4ee8495da487e07e9144bec1d25f46a0cd2dfa7cfd7a761ef15bfefc98'
             '7c0acefcfcc3ae093550caed7ec90fe84bec8f7477459ffa7e71dda76bcbdb2c'
             'e08a01d41b18bdb771d534daca99642314939aafdb088e5cfcf0ef2d33f8e7eb'
@@ -45,22 +43,16 @@ sha256sums=('f90c2da1621299f56a2e6585a6fe459ec3efd6f2fdf84a8fbf31b40be7698a73'
             '0011708e516128647dd25b59b6ebc465f36e85bbe0a8fbdc3eb04b7f28c2197f'
             'c06fc270e32a843c8b6d86335a2ec607d405dfba6875de8d8a9abde39a9e2c17'
             'b88fd2b99e7d42d414b329b814b9ff3304fa0ef9c67df81bde235bbfa0f3a3b8')
+#validpgpkeys=('D99CCEAF879747014F038D63182E23579462EFAA'  # Michal Nowak
+#              '706B6C28620E76F91D11F7DF510A642A06C52CEC') # Michał Kępień
 
 prepare() {
-  cd bind-$pkgver
-  # apply patch from the source array (should be a pacman feature)
-  local src
-  for src in "${source[@]}"; do
-    src="${src%%::*}"
-    src="${src##*/}"
-    [[ $src = *.patch ]] || continue
-    echo "Applying patch $src..."
-    patch -Np1 < "../$src"
-  done
+  cd bind9
+  autoreconf -fiv
 }
 
 build() {
-  cd bind-$pkgver
+  cd bind9
   export CFLAGS
   # support to chase DNSSEC signature chains
   CFLAGS+=' -DDIG_SIGCHASE'
@@ -85,7 +77,7 @@ build() {
 # See: https://gitlab.isc.org/isc-projects/bind9/-/blob/main/README.md#testing.
 
 package() {
-  cd bind-$pkgver
+  cd bind9
   install -dm755 "$pkgdir/usr/share/licenses/$pkgname/"
   install -Dm644 LICENSE COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/"
   make DESTDIR="$pkgdir" install