diff --git a/pkg/fedora/kernel-surface/kernel-surface.spec b/pkg/fedora/kernel-surface/kernel-surface.spec
index 3989976fa..e3ff30dac 100755
--- a/pkg/fedora/kernel-surface/kernel-surface.spec
+++ b/pkg/fedora/kernel-surface/kernel-surface.spec
@@ -2,12 +2,12 @@
 # Definitions to configure the kernel we want to build
 #
 
-%global kernel_tag_fc34 kernel-5.11.21-300.fc34
-%global kernel_tag_fc33 kernel-5.11.21-200.fc33
+%global kernel_tag_fc34 kernel-5.12.5-300.fc34
+%global kernel_tag_fc33 kernel-5.12.5-200.fc33
 %global kernel_tag_fc32 kernel-5.11.21-100.fc32
 
-%global kernel_release_fc34 2
-%global kernel_release_fc33 2
+%global kernel_release_fc34 1
+%global kernel_release_fc33 1
 %global kernel_release_fc32 2
 
 # This is what is printed in the GRUB menu. These cannot be fetched from the
@@ -17,7 +17,7 @@
 %global fedora_title_fc33 33 (Thirty Three)
 %global fedora_title_fc32 32 (Thirty Two)
 
-%global ls_patches_commit ad369a7e6dbca0a091dcc41485ea59426f93fb37
+%global ls_patches_commit 5c2a36bb3c224c035f9f08702cea21650e370252
 
 %global sb_crt surface.crt
 %global sb_key surface.key
@@ -97,6 +97,19 @@ Source21:   %{sb_key}
 Source100:  mod-sign.sh
 Source101:  parallel_xz.sh
 
+%if "%{kernel_majorver}" == "5.12"
+
+Patch0:     %{surface_source}/%{kernel_patches}/0001-surface3-oemb.patch
+Patch1:     %{surface_source}/%{kernel_patches}/0002-mwifiex.patch
+Patch2:     %{surface_source}/%{kernel_patches}/0003-ath10k.patch
+Patch3:     %{surface_source}/%{kernel_patches}/0004-ipts.patch
+Patch4:     %{surface_source}/%{kernel_patches}/0005-surface-sam-over-hid.patch
+Patch5:     %{surface_source}/%{kernel_patches}/0006-surface-sam.patch
+Patch6:     %{surface_source}/%{kernel_patches}/0007-surface-typecover.patch
+Patch7:     %{surface_source}/%{kernel_patches}/0008-cameras.patch
+
+%else
+
 Patch0:     %{surface_source}/%{kernel_patches}/0001-surface3-oemb.patch
 Patch1:     %{surface_source}/%{kernel_patches}/0002-wifi.patch
 Patch2:     %{surface_source}/%{kernel_patches}/0003-ipts.patch
@@ -108,6 +121,8 @@ Patch7:     %{surface_source}/%{kernel_patches}/0008-surface-sensors.patch
 Patch8:     %{surface_source}/%{kernel_patches}/0009-cameras.patch
 Patch9:     %{surface_source}/%{kernel_patches}/0010-ath10k-firmware-override.patch
 
+%endif
+
 Patch100:   0001-Add-secureboot-pre-signing-to-the-kernel.patch
 
 ExclusiveArch: x86_64