diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 8218d84..287249c 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,2 +1,2 @@
-DIST bind-9.18.29.tar.xz 5562720 BLAKE2B f3e7de6936362bcce4993e401ed8fdd9d597459e82ad908a918fff1da619f91ef4896595ea210b43f2b492d763d7be2b71105495858da55431b60874c7fd2312 SHA512 6c2676e2e2cb90f3bd73afb367813c54d1c961e12df1e12e41b9d0ee5a1d5cdf368d81410469753eaef37e43358b56796f078f3b2f20c3b247c4bef91d56c716
-DIST bind-9.18.29.tar.xz.asc 833 BLAKE2B afb127b5431f5e05eb1849335a692bf3a072bfc6182a8052316728a11f2f63f9f3c67a820a1d75f8d4cf3fe50e142f286f06f5392378bb64854402d3496061aa SHA512 6612c7151c4c1736e0237b8219cefbafbc1dcd4b04ad9b12b99cba703e6debde90d2f9838dd1465a47b9a002a598d9b8f3221dfe1a3bdc41436a92e6d06db472
+DIST bind-9.18.31.tar.xz 5385812 BLAKE2B e069ab3caab887a87220b54804e5b19a4c21b8d3e4e8f1bc6a7135b3990a228d6c48b1ca4a22c75242485275eff1de145a9aff89addf81124e7dfcafd8ab30cf SHA512 e51873484be3ee367eb1e601b8e0adc45abcdb16df04021ea42ffcc51b99821f8b30f67b2a693a90ad3efa51698a651c8da9d7947ee8fa19680f627afe1f7034
+DIST bind-9.18.31.tar.xz.asc 833 BLAKE2B 77ec5895e1c2ec7325d5cf0f8dd96c40d1554c99d89b4855333d017f5490e89658c4125b2e29c9b20ee574080d7fdb239421a40c8747f28dd46649bce35b665a SHA512 2c17d9a9f153264ed18b287e081b432b5310746964be3e35dfd31597622182e822e62fc3cc4034c0e1c7041949e624c43ffb10d134145d6300f8135f86e38cc6
diff --git a/net-dns/bind/bind-9.18.29-r2.ebuild b/net-dns/bind/bind-9.18.31.ebuild
similarity index 88%
rename from net-dns/bind/bind-9.18.29-r2.ebuild
rename to net-dns/bind/bind-9.18.31.ebuild
index d352d4d..15ef196 100644
--- a/net-dns/bind/bind-9.18.29-r2.ebuild
+++ b/net-dns/bind/bind-9.18.31.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/isc.asc
-inherit multiprocessing systemd tmpfiles verify-sig
+inherit systemd tmpfiles verify-sig
 
 MY_PV="${PV/_p/-P}"
 MY_PV="${MY_PV/_rc/rc}"
@@ -20,7 +20,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+caps dnsrps dnstap doc doh fixed-rrset idn jemalloc geoip gssapi lmdb selinux static-libs test xml"
+IUSE="+caps dnstap doc doh fixed-rrset idn jemalloc geoip gssapi lmdb selinux static-libs test xml"
 RESTRICT="!test? ( test )"
 
 DEPEND="
@@ -51,14 +51,24 @@ RDEPEND="
 "
 # sphinx required for man-page and html creation
 BDEPEND="
+	dev-lang/perl
 	virtual/pkgconfig
 	doc? ( dev-python/sphinx )
 	test? (
 		dev-util/cmocka
-		dev-util/kyua
 	)
 "
 
+src_prepare() {
+	default
+
+	# Don't clobber our toolchain defaults
+	sed -i -e '/FORTIFY_SOURCE=/d' configure || die
+
+	# Test is (notoriously) slow/resource intensive
+	sed -i -e 's:ISC_TEST_MAIN:int main(void) { exit(77); }:' tests/isc/netmgr_test.c || die
+}
+
 src_configure() {
 	local myeconfargs=(
 		--prefix="${EPREFIX}"/usr
@@ -70,13 +80,14 @@ src_configure() {
 		--with-json-c
 		--with-zlib
 		$(use_enable caps linux-caps)
-		$(use_enable dnsrps)
+		--disable-dnsrps
 		$(use_enable dnstap)
 		$(use_enable doh)
 		$(use_with doh libnghttp2)
 		$(use_enable fixed-rrset)
 		$(use_enable static-libs static)
 		$(use_enable geoip)
+		$(use_with test cmocka)
 		$(use_with geoip maxminddb)
 		$(use_with gssapi)
 		$(use_with idn libidn2)
@@ -91,7 +102,11 @@ src_configure() {
 src_test() {
 	# system tests ('emake test') require network configuration for IPs etc
 	# so we run the unit tests instead.
-	TEST_PARALLEL_JOBS="$(makeopts_jobs)" emake unit
+	CI=1 emake unit V=1
+
+	# libtest is an internal test helper library, it has no tests,
+	# so suppress the QA warning.
+	rm tests/libtest/test-suite.log || die
 }
 
 src_install() {
@@ -118,9 +133,6 @@ src_install() {
 	newins "${FILESDIR}"/named.conf.auth named.conf.auth
 	newins "${FILESDIR}"/redhat/named.rfc1912.zones named.rfc1912.zones.conf
 
-	insinto /var/bind/pri
-	doins "${FILESDIR}"/redhat/named.{empty,localhost,loopback}
-
 	newinitd "${FILESDIR}"/named.init-r15 named
 	newconfd "${FILESDIR}"/named.confd-r8 named
 
@@ -130,6 +142,23 @@ src_install() {
 		find "${ED}"/usr/lib* -name '*.la' -delete || die
 	fi
 
+	#
+	# /var/bind
+	#
+	# These need to remain for now because CONFIG_PROTECT won't
+	# save them and we shipped configs for years containing references
+	# to them.
+	#
+	# ftp://ftp.rs.internic.net/domain/named.cache:
+	insinto /var/bind
+	newins "${FILESDIR}"/named.cache-r4 named.cache
+	# bug #450406
+	dosym named.cache /var/bind/root.cache
+	#
+	insinto /var/bind/pri
+	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
+	doins "${FILESDIR}"/redhat/named.{empty,localhost,loopback}
+
 	dosym -r /var/bind/pri /etc/bind/pri
 	dosym -r /var/bind/sec /etc/bind/sec
 	dosym -r /var/bind/dyn /etc/bind/dyn