diff --git a/CHANGES b/CHANGES
index 389dd4995b..8c13380fe9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,8 @@
 			used RCODE instead of OPCODE to lookup the nemonic.
 			This has been corrected. [GL !6420]
 
+	--- 9.16.30 released ---
+
 5899.	[func]		Don't try to process DNSSEC-related and ZONEMD records
 			in catz. [GL #3380]
 
diff --git a/configure b/configure
index cca05c2f4c..43c4f05e4d 100755
--- a/configure
+++ b/configure
@@ -15231,7 +15231,7 @@ $as_echo "#define HAVE_GEOIP2 1" >>confdefs.h
 				   MAXMINDDB_LIBS="$MAXMINDDB_LIBS $ac_cv_search_MMDB_open"
 				   { $as_echo "$as_me:${as_lineno-$LINENO}: GeoIP2 default database path set to $with_maxminddb/share/GeoIP" >&5
 $as_echo "$as_me: GeoIP2 default database path set to $with_maxminddb/share/GeoIP" >&6;}
-				   eval MAXMINDDB_PREFIX=$with_maxminddb
+				   MAXMINDDB_PREFIX=$with_maxminddb
 
 else
   as_fn_error $? "GeoIP2 requested, but libmaxminddb not found" "$LINENO" 5
diff --git a/doc/arm/notes.rst b/doc/arm/notes.rst
index 64debcae69..06413a2466 100644
--- a/doc/arm/notes.rst
+++ b/doc/arm/notes.rst
@@ -45,6 +45,7 @@ information about each release, source code, and pre-compiled versions
 for Microsoft Windows operating systems.
 
 .. include:: ../notes/notes-current.rst
+.. include:: ../notes/notes-9.16.30.rst
 .. include:: ../notes/notes-9.16.29.rst
 .. include:: ../notes/notes-9.16.28.rst
 .. include:: ../notes/notes-9.16.27.rst
diff --git a/doc/notes/notes-9.16.30.rst b/doc/notes/notes-9.16.30.rst
new file mode 100644
index 0000000000..37c79fe2ab
--- /dev/null
+++ b/doc/notes/notes-9.16.30.rst
@@ -0,0 +1,30 @@
+.. Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+..
+.. SPDX-License-Identifier: MPL-2.0
+..
+.. This Source Code Form is subject to the terms of the Mozilla Public
+.. License, v. 2.0.  If a copy of the MPL was not distributed with this
+.. file, you can obtain one at https://mozilla.org/MPL/2.0/.
+..
+.. See the COPYRIGHT file distributed with this work for additional
+.. information regarding copyright ownership.
+
+Notes for BIND 9.16.30
+----------------------
+
+Bug Fixes
+~~~~~~~~~
+
+- The ``fetches-per-server`` quota is designed to adjust itself downward
+  automatically when an authoritative server times out too frequently.
+  Due to a coding error, that adjustment was applied incorrectly, so
+  that the quota for a congested server was always set to 1. This has
+  been fixed. :gl:`#3327`
+
+- DNSSEC-signed catalog zones were not being processed correctly. This
+  has been fixed. :gl:`#3380`
+
+- Key files were updated every time the ``dnssec-policy`` key manager
+  ran, whether the metadata had changed or not. :iscman:`named` now
+  checks whether changes were applied before writing out the key files.
+  :gl:`#3302`