diff --git a/Makefile.rhelver b/Makefile.rhelver
index 2d435bed7..cb5bf1f10 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 99
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 35
+RHEL_RELEASE = 36
 
 #
 # RHEL_REBASE_NUM
diff --git a/kernel.spec b/kernel.spec
index 303ec27a9..263e8b638 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -148,13 +148,13 @@ Summary: The Linux kernel
 %define specrpmversion 6.4.0
 %define specversion 6.4.0
 %define patchversion 6.4
-%define pkgrelease 0.rc4.20230529gite338142b39cf.35
+%define pkgrelease 0.rc4.20230530git8b817fded42d.36
 %define kversion 6
-%define tarfile_release 6.4-rc4-13-ge338142b39cf
+%define tarfile_release 6.4-rc4-31-g8b817fded42d
 # This is needed to do merge window version magic
 %define patchlevel 4
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc4.20230529gite338142b39cf.35%{?buildid}%{?dist}
+%define specrelease 0.rc4.20230530git8b817fded42d.36%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.4.0
 
@@ -3415,6 +3415,9 @@ fi
 #
 #
 %changelog
+* Tue May 30 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.4.0-0.rc4.8b817fded42d.36]
+- Linux v6.4.0-0.rc4.8b817fded42d
+
 * Mon May 29 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.4.0-0.rc4.e338142b39cf.35]
 - Linux v6.4.0-0.rc4.e338142b39cf
 
diff --git a/patch-6.4-redhat.patch b/patch-6.4-redhat.patch
index c8c9880fc..fa76b71a5 100644
--- a/patch-6.4-redhat.patch
+++ b/patch-6.4-redhat.patch
@@ -2566,7 +2566,7 @@ index 14f39c1e573e..d221300ae815 100644
  	}
 
 diff --git a/kernel/module/main.c b/kernel/module/main.c
-index b4c7e925fdb0..f1a420409762 100644
+index 044aa2c9e3cb..2d646a3396ac 100644
 --- a/kernel/module/main.c
 +++ b/kernel/module/main.c
 @@ -528,6 +528,7 @@ static struct module_attribute modinfo_##field = {                    \
diff --git a/sources b/sources
index 46bc9ab62..c2a13e13f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.4-rc4-13-ge338142b39cf.tar.xz) = c1917f3cecb8d568c6301ddebff34213af22f3c455aa2c3cf70f2dbd503937ef5ed46fa0a1513fe645abbdef82610a50a4f9119365b2fc77dc05fcf7bdcb0bec
-SHA512 (kernel-abi-stablelists-6.4.0.tar.bz2) = 9daf6a0b97bce4cbd7e8d6ae36b7812b44d691f19457e86765a44865b4863bec5bba5c155e145dd60e315ec9ae561df82d0a38af95c24771383ad8348d21dc9d
-SHA512 (kernel-kabi-dw-6.4.0.tar.bz2) = b299e1b99414fa946530ce393e36b0f1d926ccef240aa4fc475dd9060e326508b33d8a8de891410d5367b5f12e108aa69a71619ed7aad95bc977ba0c0891da9e
+SHA512 (linux-6.4-rc4-31-g8b817fded42d.tar.xz) = e0ba6e33929acdfa51ddbf6b7747135f8c87aeafc75642e548cb96805f05a512234785c342104f23e45f5da2e95ffba5bab52709b03f47bde187691f2d4ca07e
+SHA512 (kernel-abi-stablelists-6.4.0.tar.bz2) = cb789a7beadc49ab06a829a1476c5de262117b21a4b8d489b95867ca7ea13a464f22abf97308f0cd3e7fa4c412f705d42c00606b8764cac88bbc4bbb0b6c62ba
+SHA512 (kernel-kabi-dw-6.4.0.tar.bz2) = db117fed2ef0cdf3c0401388ee6a570a50cd37e13d17917547bf28777858fbb3acd5c148e4269dc91246f16067ef5a0558040336335491e3eefa9a4ea32bc77b