diff --git a/pkg/arch/kernel/0005-surface-sam-over-hid.patch b/pkg/arch/kernel/0005-surface-sam-over-hid.patch
deleted file mode 120000
index 26f99f3ca..000000000
--- a/pkg/arch/kernel/0005-surface-sam-over-hid.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../../patches/6.0/0005-surface-sam-over-hid.patch
\ No newline at end of file
diff --git a/pkg/arch/kernel/0005-surface-sam.patch b/pkg/arch/kernel/0005-surface-sam.patch
new file mode 120000
index 000000000..9ac12fe4b
--- /dev/null
+++ b/pkg/arch/kernel/0005-surface-sam.patch
@@ -0,0 +1 @@
+../../../patches/6.0/0005-surface-sam.patch
\ No newline at end of file
diff --git a/pkg/arch/kernel/0006-surface-button.patch b/pkg/arch/kernel/0006-surface-button.patch
deleted file mode 120000
index 20b3cc47a..000000000
--- a/pkg/arch/kernel/0006-surface-button.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../../patches/6.0/0006-surface-button.patch
\ No newline at end of file
diff --git a/pkg/arch/kernel/0006-surface-sam-over-hid.patch b/pkg/arch/kernel/0006-surface-sam-over-hid.patch
new file mode 120000
index 000000000..bb5e89c12
--- /dev/null
+++ b/pkg/arch/kernel/0006-surface-sam-over-hid.patch
@@ -0,0 +1 @@
+../../../patches/6.0/0006-surface-sam-over-hid.patch
\ No newline at end of file
diff --git a/pkg/arch/kernel/0007-surface-button.patch b/pkg/arch/kernel/0007-surface-button.patch
new file mode 120000
index 000000000..98af64822
--- /dev/null
+++ b/pkg/arch/kernel/0007-surface-button.patch
@@ -0,0 +1 @@
+../../../patches/6.0/0007-surface-button.patch
\ No newline at end of file
diff --git a/pkg/arch/kernel/0007-surface-typecover.patch b/pkg/arch/kernel/0007-surface-typecover.patch
deleted file mode 120000
index 291737503..000000000
--- a/pkg/arch/kernel/0007-surface-typecover.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../../patches/6.0/0007-surface-typecover.patch
\ No newline at end of file
diff --git a/pkg/arch/kernel/0008-cameras.patch b/pkg/arch/kernel/0008-cameras.patch
deleted file mode 120000
index 876530583..000000000
--- a/pkg/arch/kernel/0008-cameras.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../../patches/6.0/0008-cameras.patch
\ No newline at end of file
diff --git a/pkg/arch/kernel/0008-surface-typecover.patch b/pkg/arch/kernel/0008-surface-typecover.patch
new file mode 120000
index 000000000..3327ee12c
--- /dev/null
+++ b/pkg/arch/kernel/0008-surface-typecover.patch
@@ -0,0 +1 @@
+../../../patches/6.0/0008-surface-typecover.patch
\ No newline at end of file
diff --git a/pkg/arch/kernel/0009-amd-gpio.patch b/pkg/arch/kernel/0009-amd-gpio.patch
deleted file mode 120000
index e26d8849b..000000000
--- a/pkg/arch/kernel/0009-amd-gpio.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../../patches/6.0/0009-amd-gpio.patch
\ No newline at end of file
diff --git a/pkg/arch/kernel/0009-cameras.patch b/pkg/arch/kernel/0009-cameras.patch
new file mode 120000
index 000000000..2245da2db
--- /dev/null
+++ b/pkg/arch/kernel/0009-cameras.patch
@@ -0,0 +1 @@
+../../../patches/6.0/0009-cameras.patch
\ No newline at end of file
diff --git a/pkg/arch/kernel/0010-amd-gpio.patch b/pkg/arch/kernel/0010-amd-gpio.patch
new file mode 120000
index 000000000..1d2a13db7
--- /dev/null
+++ b/pkg/arch/kernel/0010-amd-gpio.patch
@@ -0,0 +1 @@
+../../../patches/6.0/0010-amd-gpio.patch
\ No newline at end of file
diff --git a/pkg/arch/kernel/PKGBUILD b/pkg/arch/kernel/PKGBUILD
index c17faa5d3..67c81f63b 100644
--- a/pkg/arch/kernel/PKGBUILD
+++ b/pkg/arch/kernel/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgbase=linux-surface
-pkgver=6.0.6.arch1
+pkgver=6.0.7.arch1
 pkgrel=1
 pkgdesc='Linux'
 _shortver=${pkgver%.*}
@@ -33,11 +33,12 @@ source=(
   0002-mwifiex.patch
   0003-ath10k.patch
   0004-ipts.patch
-  0005-surface-sam-over-hid.patch
-  0006-surface-button.patch
-  0007-surface-typecover.patch
-  0008-cameras.patch
-  0009-amd-gpio.patch
+  0005-surface-sam.patch
+  0006-surface-sam-over-hid.patch
+  0007-surface-button.patch
+  0008-surface-typecover.patch
+  0009-cameras.patch
+  0010-amd-gpio.patch
 )
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
@@ -48,15 +49,16 @@ sha256sums=('SKIP'
             '6ed43ed093ec7dcbbac286edc204873edfa77e380ac43c8cc2f40b2965ac1aa3'
             'f68809bdfa1924cc4d03a6a0d00b6389805eb1a58edfce5beac1dabc398ec6c8'
             '22902a3ac84f3ae0a8b442a99c63f81ce8f2dfd678c7c66420fffd52110f11d9'
-            'f7d9ac53d4ab5b4ad9d02e5a1af06a1e828b97e3a4755bd6539c93397d2e3746'
-            '91a2efa55857c5f14d6c61e37afe353bdfe58acf00d599def2d59881fd8c1e53'
-            '8f0abd75e5ea8d8f00387905f94eb204154b8962115dcf49414cac3303cbd703'
-            '0c4d18d26842c4ba4a390453d92852f28847c2665e6377379db54f3c6cd16f59'
-            '955cb86af49e333f75fed6db7d25b7728a9ec2e54c513cde6e7dcf16b1bef7aa'
-            '4ff7ee2888ecb39571da9a21d5f0daaafab0d751ad427185d3c3785eed4054e0'
-            '481f66868be9d4c8b9a801d15cad68cf06d8d0dea9eb47533006d0055e75d60b'
-            'f4e103a58ea7c7233d4eb2b40d7372097dadfa689f4fe0138751b23ac5d8c359'
-            '01fc0c0147e49dbdf619315a2b810c9fc9bd34c9d3bcb257650615ee035b17bf')
+            '91673c6f4d935505ce96179377904ff5a101e657d9251bd288d234cc8ec1cae1'
+            '65e7a863c096b39835bb50df63a8d83aa2e2a56d810eb590e203568930e02e74'
+            '22d9da11896b58f55bdf4f23bb0f7a2e4400fd66e7a8d7ef70102a886d9376a0'
+            'b83eb39ae434f75656534699578e7ed75155bd1edc6ed637f247cc51d3766af5'
+            'bf8aa5b8afe86f07c1ef72e5d0f8b011b0d53572a175fbb0b17ada2bf52cfa7a'
+            '95c938f9366321d9b87ed3d9f7f5258206f8811d3ba70dc54a92a4fbecec0d83'
+            'fe2ad5871b69ffb48a8a30e8154f4a7fbc56cf0a520e7415652ec240de340420'
+            'bfc223735347b8d06fb3cf465f98a42949d29eae950fed614ba2e0ccf051c3d4'
+            'c0fdc34cb005767f1eba95e2ced7ad8e69d028313fe5869c7b60f621ff9cc423'
+            'e7d27a88fa449082e8e42260d81007501fc4d3b3deabb7afe3336256d741115e')
 
 
 export KBUILD_BUILD_HOST=archlinux