diff --git a/NEWS b/NEWS
index 7e738624d2..d8f7bfbcd6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
                        User-Visible OpenAFS Changes
 
+OpenAFS 1.8.13.2
+
+  Linux clients
+
+    * Add support for Linux 6.13 (16063)
+
 OpenAFS 1.8.13.1
 
   AIX
diff --git a/configure-libafs.ac b/configure-libafs.ac
index 559344ff8b..444b849f94 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.14d1
+MACOS_VERSION=1.8.14d2
 
 AC_SUBST([MACOS_VERSION])
 
diff --git a/configure.ac b/configure.ac
index 403f233dc3..e34cf1c6ef 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.14d1
+MACOS_VERSION=1.8.14d2
 
 AC_SUBST([MACOS_VERSION])
 
diff --git a/src/config/NTMakefile.amd64_w2k b/src/config/NTMakefile.amd64_w2k
index ab034c6d06..b8ed6dff32 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=1301
+AFSPRODUCT_VER_PATCH=1302
 !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 5502f74764..83b434899d 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=1301
+AFSPRODUCT_VER_PATCH=1302
 !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 b8cc40e397..91f2791fcc 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=1301
+AFSPRODUCT_VER_PATCH=1302
 !ENDIF
 !IF !DEFINED(AFSPRODUCT_VER_BUILD)
 AFSPRODUCT_VER_BUILD=0
diff --git a/src/libafs/MakefileProto.LINUX.in b/src/libafs/MakefileProto.LINUX.in
index 6e62c8c97f..2509944e9a 100644
--- a/src/libafs/MakefileProto.LINUX.in
+++ b/src/libafs/MakefileProto.LINUX.in
@@ -151,7 +151,7 @@ LINUX_MODULE_EXT=o
 LINUX_MODULE_NAME=
 LOCAL_SMP_DEF=
 
-setup:
+setup: AFS_component_version_number.c
 	-$(RM) -f h net netinet sys rpc
 	-ln -fs rx rpc
 	for m in ${MPS} ; do \
diff --git a/src/libafs/make_kbuild_makefile.pl b/src/libafs/make_kbuild_makefile.pl
index 3302ebe77b..944ac762f2 100755
--- a/src/libafs/make_kbuild_makefile.pl
+++ b/src/libafs/make_kbuild_makefile.pl
@@ -61,19 +61,19 @@ foreach $mf (@Makefiles) {
   $F->close();
 }
 
+# AFS_component_version_number.c is a special case. There is no single location
+# where it normally exists; usually it's generated in every subsystem, so our
+# makefiles don't specify an absolute path to the source file (they just say to
+# use the AFS_component_version_number.c from the current directory). Here, to
+# make it more like our other source files, we say we want to use
+# AFS_component_version_number.c from src/libafs.
+$deps{'AFS_component_version_number.o'} = "$vars{TOP_OBJDIR}/src/libafs/AFS_component_version_number.c";
+
 
 $KDIR = "$vars{TOP_OBJDIR}/src/libafs/$KDIR";
 @libafs_objs = (split(' ', $vars{AFSAOBJS}), split(' ', $vars{AFSNFSOBJS}));
 @afspag_objs = (split(' ', $vars{AFSPAGOBJS}));
 
-$MV = new IO::File("$vars{TOP_OBJDIR}/src/config/Makefile.version", O_RDONLY)
-        or die "$vars{TOP_OBJDIR}/src/config/Makefile.version: $!\n";
-while (<$MV>) {
-  s#AFS_component_version_number#$KDIR/AFS_component_version_number#g;
-  $MakefileVersion .= $_;
-}
-$MV->close();
-
 if (! -d $KDIR) {
   mkdir($KDIR, 0777) or die "$KDIR: $!\n";
 }
@@ -170,6 +170,5 @@ if ($vars{LINUX_KBUILD_CFLAGS_VAR} ne "") {
 print $F "obj-m := $TARG.o afspag.o\n";
 print $F "$TARG-objs := ", join("\\\n $_", @libafs_objs), "\n";
 print $F "afspag-objs := ", join("\\\n $_", @afspag_objs), "\n";
-print $F "\n$MakefileVersion\n";
 $F->close() or die "$KDIR/Makefile: $!\n";