diff --git a/kernel.spec b/kernel.spec
index c4b5d3630..5b80042ee 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -122,11 +122,11 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 1
 # define buildid .local
-%define specversion 5.18.6
+%define specversion 5.18.7
 %define patchversion 5.18
 %define pkgrelease 200
 %define kversion 5
-%define tarfile_release 5.18.6
+%define tarfile_release 5.18.7
 # This is needed to do merge window version magic
 %define patchlevel 18
 # allow pkg_release to have configurable %%{?dist} tag
@@ -3034,6 +3034,9 @@ fi
 #
 #
 %changelog
+
+* Sat Jun 25 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.18.7-200]
+- v5.18.7 rebase
 * Wed Jun 22 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.18.6-0]
 - drm/i915: Temporarily disable selective fetch for PSR2 on ADL-P (Mark Pearson) [2065794]
 - Turn E1000 back on correctly (Justin M. Forbes)
diff --git a/patch-5.18-redhat.patch b/patch-5.18-redhat.patch
index 16a0cc39a..0008a891f 100644
--- a/patch-5.18-redhat.patch
+++ b/patch-5.18-redhat.patch
@@ -45,7 +45,7 @@
  44 files changed, 721 insertions(+), 191 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 27850d452d65..c6cd7b49725d 100644
+index 61d63068553c..cd3197d5397e 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
diff --git a/sources b/sources
index c201c7ad5..dd9da9823 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.18.6.tar.xz) = f2cafbc5c0a39074d68b5b8ee294ea7ff44d6b65a624f5bc1acc31d35b9268e9f7048518ab24e75196392938afee146174aa179e83e6627a9bec262fcb51343c
-SHA512 (kernel-abi-stablelists-5.18.6-200.tar.bz2) = 25df719643d04cdd17accfd689afbfb9a71569ed1f513296278b72097966edf3a3c25f1e6dda29dbb29a78d2ae35ea142bf90fcb797ebd5cae7a74dd71f0c010
-SHA512 (kernel-kabi-dw-5.18.6-200.tar.bz2) = a5fe2b56d19694be8dc3615e5e07edda7d6f7a9bc8f5fa878edb5b80b149eac12619190676275d290e3a4a4e50ee8f31fecf94e30b4845b56a4b03b9edb0d2c3
+SHA512 (linux-5.18.7.tar.xz) = a943d7842e757b1386ff9ef0c319bbea74bd9ff7a43db7e1be2dea8d8ca0bb16d0bfb3d7f735652a2351095d4a47dc7a42b9459b133d00dc0d73dbf26fc0911d
+SHA512 (kernel-abi-stablelists-5.18.7-200.tar.bz2) = 9c30296ec4d0909bbc3c24aa19515876f3a11a82cb07af415ee1a0c1f951c8f0011621e4dc9b91d5a7caf7a63fd41790548977373d490c42d794421237ab69c2
+SHA512 (kernel-kabi-dw-5.18.7-200.tar.bz2) = 70fd6a26797716eb6a4d80c7bd2529663d9f271b67f79be61d9d27ff85a0af55e9fd1bad443894307910d78b627c840cda68abc0c051bd0f8834954bd5db1102