diff --git a/CHANGES b/CHANGES
index fae091bf04..a78c165cc6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -11,12 +11,17 @@
 			that is in a different view, "in-view" logic was not
 			taken into account. This has been fixed. [GL #2783]
 
-5660.	[bug]		Checking of key-directory and dnssec-policy was broken.
-			The checks failed to account for key-directory
-			inheritance. [GL #2778]
+5660.	[bug]		The configuration-checking code failed to account for
+			the inheritance rules of the "key-directory" option.
+			[GL #2778]
 
-5659.	[bug]		'W' in wildcard expansions was being mapped to '\000'.
-			[GL #2779]
+			This change was included in BIND 9.17.15.
+
+5659.	[bug]		When preparing DNS responses, named could replace the
+			letters 'W' (uppercase) and 'w' (lowercase) with '\000'.
+			This has been fixed. [GL #2779]
+
+			This change was included in BIND 9.17.15.
 
 5658.	[bug]		Increasing "max-cache-size" for a running named instance
 			(using "rndc reconfig") was not causing the hash tables
diff --git a/configure.ac b/configure.ac
index f1b3ac0b2c..3fb21c1ea8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@
 #
 m4_define([bind_VERSION_MAJOR], 9)dnl
 m4_define([bind_VERSION_MINOR], 17)dnl
-m4_define([bind_VERSION_PATCH], 14)dnl
+m4_define([bind_VERSION_PATCH], 15)dnl
 m4_define([bind_VERSION_EXTRA], )dnl
 m4_define([bind_DESCRIPTION], [(Development Release)])dnl
 m4_define([bind_SRCID], [m4_esyscmd_s([git rev-parse --short HEAD | cut -b1-7])])dnl
diff --git a/doc/arm/notes.rst b/doc/arm/notes.rst
index 4cce67f9ad..d3678cb652 100644
--- a/doc/arm/notes.rst
+++ b/doc/arm/notes.rst
@@ -52,6 +52,7 @@ https://www.isc.org/download/. There you will find additional
 information about each release, and source code.
 
 .. include:: ../notes/notes-current.rst
+.. include:: ../notes/notes-9.17.15.rst
 .. include:: ../notes/notes-9.17.14.rst
 .. include:: ../notes/notes-9.17.13.rst
 .. include:: ../notes/notes-9.17.12.rst
diff --git a/doc/notes/notes-9.17.15.rst b/doc/notes/notes-9.17.15.rst
new file mode 100644
index 0000000000..2a295301b3
--- /dev/null
+++ b/doc/notes/notes-9.17.15.rst
@@ -0,0 +1,25 @@
+.. 
+   Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+   
+   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.17.15
+----------------------
+
+Bug Fixes
+~~~~~~~~~
+
+- When preparing DNS responses, ``named`` could replace the letters
+  ``W`` (uppercase) and ``w`` (lowercase) with ``\000``. This has been
+  fixed. :gl:`#2779`
+
+- The configuration-checking code failed to account for the inheritance
+  rules of the ``key-directory`` option. As a side effect of this flaw,
+  the code detecting ``key-directory`` conflicts for zones using KASP
+  incorrectly reported unique key directories as being reused. This has
+  been fixed. :gl:`#2778`
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index ced974c1f0..1aa3a8c3b1 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -8,7 +8,7 @@
    See the COPYRIGHT file distributed with this work for additional
    information regarding copyright ownership.
 
-Notes for BIND 9.17.15
+Notes for BIND 9.17.16
 ----------------------
 
 Security Fixes
@@ -53,13 +53,6 @@ Bug Fixes
   when both wildcard expansion and CNAME chaining were required to
   prepare the response. This has been fixed. :gl:`#2759`
 
-- Queries where the wildcard match contained the letter ``W`` failed
-  to return the correct response as the ``W`` was mapped to ``\000``.
-  :gl:`#2779`
-
-- Checking of ``key-directory`` and ``dnssec-policy`` was broken.
-  The checks failed to account for key-directory inheritance. :gl:`#2778`
-
 - A deadlock at startup was introduced when fixing :gl:`#1875` because when
   locking key files for reading and writing, "in-view" logic was not taken into
   account. This has been fixed. :gl:`#2783`