diff --git a/NEWS b/NEWS
index b47b780669..bc48e71d54 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
                        User-Visible OpenAFS Changes
 
-OpenAFS 1.8.9 (in progress)
+OpenAFS 1.8.9
 
   All platforms
 
@@ -26,6 +26,12 @@ OpenAFS 1.8.9 (in progress)
       unnecessary several second delays in some cases during database
       quorum processing (14815)
 
+    * Detect invalid (negative) inputs to FetchData RPCs and reject them
+      early.  The previous behavior only detected the error when actually
+      attempting to read from storage, which resulted in the volume being
+      taken offline since errors were assumed to originate from the
+      underlying storage (15224)
+
   All UNIX/Linux client platforms
 
     * Do not perform DNS SRV/AFSDB record queries when running "fs
diff --git a/configure-libafs.ac b/configure-libafs.ac
index 1d3d65f436..ad21dbdbbf 100644
--- a/configure-libafs.ac
+++ b/configure-libafs.ac
@@ -4,7 +4,7 @@ AC_CONFIG_AUX_DIR([build-tools])
 AC_CONFIG_SRCDIR([src/libafs/Makefile.common.in])
 
 AC_CONFIG_HEADERS([src/config/afsconfig.h])
-MACOS_VERSION=1.8.9fc2
+MACOS_VERSION=1.8.9
 
 AC_SUBST([MACOS_VERSION])
 
diff --git a/configure.ac b/configure.ac
index e465544f84..f226c88ae0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ AC_CONFIG_MACRO_DIR([src/cf])
 AC_CONFIG_SRCDIR([src/config/stds.h])
 
 AC_CONFIG_HEADERS([src/config/afsconfig.h])
-MACOS_VERSION=1.8.9fc2
+MACOS_VERSION=1.8.9
 
 AC_SUBST([MACOS_VERSION])
 
diff --git a/src/config/NTMakefile.amd64_w2k b/src/config/NTMakefile.amd64_w2k
index 81eaaa4ea4..ba8b6e2a8a 100644
--- a/src/config/NTMakefile.amd64_w2k
+++ b/src/config/NTMakefile.amd64_w2k
@@ -88,7 +88,7 @@ AFSPRODUCT_VER_MAJOR=1
 AFSPRODUCT_VER_MINOR=8
 !ENDIF
 !IF !DEFINED(AFSPRODUCT_VER_PATCH)
-AFSPRODUCT_VER_PATCH=0901
+AFSPRODUCT_VER_PATCH=0902
 !ENDIF
 !IF !DEFINED(AFSPRODUCT_VER_BUILD)
 AFSPRODUCT_VER_BUILD=0
diff --git a/src/config/NTMakefile.i386_nt40 b/src/config/NTMakefile.i386_nt40
index a63022be9e..1365ca7f32 100644
--- a/src/config/NTMakefile.i386_nt40
+++ b/src/config/NTMakefile.i386_nt40
@@ -88,7 +88,7 @@ AFSPRODUCT_VER_MAJOR=1
 AFSPRODUCT_VER_MINOR=8
 !ENDIF
 !IF !DEFINED(AFSPRODUCT_VER_PATCH)
-AFSPRODUCT_VER_PATCH=0901
+AFSPRODUCT_VER_PATCH=0902
 !ENDIF
 !IF !DEFINED(AFSPRODUCT_VER_BUILD)
 AFSPRODUCT_VER_BUILD=0
diff --git a/src/config/NTMakefile.i386_w2k b/src/config/NTMakefile.i386_w2k
index 4cfb55f039..9f27a1378e 100644
--- a/src/config/NTMakefile.i386_w2k
+++ b/src/config/NTMakefile.i386_w2k
@@ -92,7 +92,7 @@ AFSPRODUCT_VER_MAJOR=1
 AFSPRODUCT_VER_MINOR=8
 !ENDIF
 !IF !DEFINED(AFSPRODUCT_VER_PATCH)
-AFSPRODUCT_VER_PATCH=0901
+AFSPRODUCT_VER_PATCH=0902
 !ENDIF
 !IF !DEFINED(AFSPRODUCT_VER_BUILD)
 AFSPRODUCT_VER_BUILD=0