diff --git a/kernel.spec b/kernel.spec
index 74a9651..a9f7801 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -106,7 +106,7 @@ Summary: The Linux kernel
 %define primary_target rhel
 %endif
 
-%define rpmversion 5.12.17
+%define rpmversion 5.12.18
 %define stableversion 5.12
 %define pkgrelease 200
 
@@ -623,7 +623,7 @@ BuildRequires: clang
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.12.17.tar.xz
+Source0: linux-5.12.18.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1277,8 +1277,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.12.17 -c
-mv linux-5.12.17 linux-%{KVERREL}
+%setup -q -n kernel-5.12.18 -c
+mv linux-5.12.18 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -2792,6 +2792,13 @@ fi
 #
 #
 %changelog
+* Mon Jul 19 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.12.18-200]
+- kernel-5.12.18-0 (Justin M. Forbes)
+- Don't tag a release as [redhat] (Justin M. Forbes)
+
+* Mon Jul 19 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.12.18-0]
+- Don't tag a release as [redhat] (Justin M. Forbes)
+
 * Wed Jun 30 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.12.14-0]
 - Add CONFIG_SYSTEM_REVOCATION_LIST backported config option for 5.12.14 (Justin M. Forbes)
 - can: bcm: delay release of struct bcm_op after synchronize_rcu (Thadeu Lima de Souza Cascardo)
diff --git a/patch-5.12-redhat.patch b/patch-5.12-redhat.patch
index 3485d76..e44701d 100644
--- a/patch-5.12-redhat.patch
+++ b/patch-5.12-redhat.patch
@@ -65,7 +65,7 @@ index 75a9dd98e76e..3ff3291551f9 100644
 
  Boot into System Kernel
 diff --git a/Makefile b/Makefile
-index f1d0775925cc..f9229000f2df 100644
+index b708d7c665e1..a5597ee8bdac 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -495,6 +495,7 @@ KBUILD_AFLAGS   := -D__ASSEMBLY__ -fno-PIE
@@ -1026,7 +1026,7 @@ index a751553fa0db..dbb981876556 100644
 +obj-$(CONFIG_ARM64) += pcie-tegra194.o
  endif
 diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
-index 0e94190ca4e8..dfc5d6772e64 100644
+index 8dee6d3f33a7..d1b3dcea4340 100644
 --- a/drivers/pci/controller/dwc/pcie-tegra194.c
 +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
 @@ -22,6 +22,8 @@
@@ -1143,7 +1143,7 @@ index 0e94190ca4e8..dfc5d6772e64 100644
  static inline struct tegra_pcie_dw *to_tegra_pcie(struct dw_pcie *pci)
  {
  	return container_of(pci, struct tegra_pcie_dw, pci);
-@@ -2311,3 +2411,6 @@ MODULE_DEVICE_TABLE(of, tegra_pcie_dw_of_match);
+@@ -2313,3 +2413,6 @@ MODULE_DEVICE_TABLE(of, tegra_pcie_dw_of_match);
  MODULE_AUTHOR("Vidya Sagar <vidyas@nvidia.com>");
  MODULE_DESCRIPTION("NVIDIA PCIe host controller driver");
  MODULE_LICENSE("GPL v2");
@@ -1151,10 +1151,10 @@ index 0e94190ca4e8..dfc5d6772e64 100644
 +#endif /* CONFIG_PCIE_TEGRA194 */
 +
 diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index 7bf76bca888d..804c0bc8bb4d 100644
+index 909343ee7e0a..ffda4be3bd39 100644
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
-@@ -4230,6 +4230,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000,
+@@ -4241,6 +4241,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000,
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9084,
  				quirk_bridge_cavm_thrx2_pcie_root);
 
diff --git a/sources b/sources
index a6cc3b0..0c50733 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.12.17.tar.xz) = 01747cfab310aa93ad5d3a79d392745c4a790bfeb5a4c12f6fd848a1459934aa86396c33d84bfbf56188b7a350b7665c268e1a69f38c1e78bdef88adc74311e7
-SHA512 (kernel-abi-whitelists-5.12.17-200.tar.bz2) = fb75fe45aa51de1d54619667e319a06acc47b5fff23be72268db277563adb8983c5407bd49a62106411b6f5819d9e277e3c53b878de80ae6dc9f0a362bd1182d
-SHA512 (kernel-kabi-dw-5.12.17-200.tar.bz2) = 6c065c0a0ab30f76fedeef16f89ee83945f4a9b31767048d4f8f7198466cde96e1a4b524f6105d749f9080821792d4070bec110a00224a10dd2ee96a11f02809
+SHA512 (linux-5.12.18.tar.xz) = a2ddef5cd2f21b837542269f1a9ebaefa446660c58e3115499844585ac4349019bd95e123b0504a9211af87332d7c5e4752eeb823b331acbdd1fbb8336a150cc
+SHA512 (kernel-abi-whitelists-5.12.18-200.tar.bz2) = c18840710eca82a5d2aebe0179ea99640a35d9c22e0501e10dd3b5df16226e7f7eab58b3e6d0930bb390f2911a09baadf085bb798383f295080145022a13feaa
+SHA512 (kernel-kabi-dw-5.12.18-200.tar.bz2) = a5d60a2b2db7f08ab1e476658d1001073a112fbecec6bd1434c059caccd4bfd2a31228644f25928323c91281f69bb483821568dcee9ac45b7366a2bd27dc24c7