diff --git a/config/arm64/vanilla b/config/arm64/vanilla
index d901510..487739a 100644
--- a/config/arm64/vanilla
+++ b/config/arm64/vanilla
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.9.0-rc3 Kernel Configuration
+# Linux/arm64 6.9.0-rc4 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
 CONFIG_CC_IS_GCC=y
diff --git a/config/armv7hl/vanilla b/config/armv7hl/vanilla
index dc6a562..411070c 100644
--- a/config/armv7hl/vanilla
+++ b/config/armv7hl/vanilla
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 6.9.0-rc3 Kernel Configuration
+# Linux/arm 6.9.0-rc4 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
 CONFIG_CC_IS_GCC=y
diff --git a/config/i386/vanilla b/config/i386/vanilla
index f7d55c1..99dd5d2 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 6.9.0-rc3 Kernel Configuration
+# Linux/i386 6.9.0-rc4 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
 CONFIG_CC_IS_GCC=y
@@ -547,8 +547,7 @@ CONFIG_MITIGATION_RETPOLINE=y
 CONFIG_MITIGATION_RETHUNK=y
 # CONFIG_MITIGATION_GDS_FORCE is not set
 CONFIG_MITIGATION_RFDS=y
-CONFIG_SPECTRE_BHI_ON=y
-# CONFIG_SPECTRE_BHI_OFF is not set
+CONFIG_MITIGATION_SPECTRE_BHI=y
 
 #
 # Power management and ACPI options
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index dc37e44..bf3f48d 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 6.9.0-rc3 Kernel Configuration
+# Linux/powerpc 6.9.0-rc4 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
 CONFIG_CC_IS_GCC=y
diff --git a/config/ppc64le/vanilla b/config/ppc64le/vanilla
index 0fe4f7b..c87d431 100644
--- a/config/ppc64le/vanilla
+++ b/config/ppc64le/vanilla
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 6.9.0-rc3 Kernel Configuration
+# Linux/powerpc 6.9.0-rc4 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
 CONFIG_CC_IS_GCC=y
diff --git a/config/riscv64/vanilla b/config/riscv64/vanilla
index 8fe3332..5214475 100644
--- a/config/riscv64/vanilla
+++ b/config/riscv64/vanilla
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/riscv 6.9.0-rc3 Kernel Configuration
+# Linux/riscv 6.9.0-rc4 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
 CONFIG_CC_IS_GCC=y
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index 000bce9..070645a 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 6.9.0-rc3 Kernel Configuration
+# Linux/x86_64 6.9.0-rc4 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)"
 CONFIG_CC_IS_GCC=y
@@ -570,8 +570,7 @@ CONFIG_MITIGATION_SRSO=y
 CONFIG_MITIGATION_SLS=y
 # CONFIG_MITIGATION_GDS_FORCE is not set
 CONFIG_MITIGATION_RFDS=y
-CONFIG_SPECTRE_BHI_ON=y
-# CONFIG_SPECTRE_BHI_OFF is not set
+CONFIG_MITIGATION_SPECTRE_BHI=y
 CONFIG_ARCH_HAS_ADD_PAGES=y
 
 #
diff --git a/rpm/config.sh b/rpm/config.sh
index 166644b..6645a34 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
 # The version of the main tarball to use
-SRCVERSION=6.9-rc3-355-g7efd0a74039f
+SRCVERSION=6.9-rc4
 # variant of the kernel-source package, either empty or "-rt"
 VARIANT=-vanilla
 # Set to 1 to use the variant kernel for kernel-obs-build