diff --git a/linux-tkg-config/prepare b/linux-tkg-config/prepare
index 295f19f..0b3a5e6 100644
--- a/linux-tkg-config/prepare
+++ b/linux-tkg-config/prepare
@@ -452,7 +452,7 @@ _tkg_srcprep() {
   elif [ "$_basever" = "57" ]; then
     _outdated="outdated_versions/"
     _patch_name="enable_additional_cpu_optimizations_for_gcc_v10.1%2B_kernel_v5.7"
-  elif (( 58 <= "$_basever" &&  "$_basever" <= 514 )); then
+  elif (( 58 <= "$_basever" &&  "$_basever" <= 514 && "$_basever" != 6* )); then
     _patch_name="more-uarches-for-kernel-5.8-5.14"
   elif [[ "$_basever" =~ ^(515|516)$ ]]; then
     _patch_name="more-uarches-for-kernel-5.15-5.16"
@@ -460,16 +460,13 @@ _tkg_srcprep() {
     _patch_name="more-uarches-for-kernel-5.17%2B"
   fi
 
-  if [ "$_basever" != "60" ]; then
-    wget -O "${_patch_location}/${_patch_name}.patch" "https://raw.githubusercontent.com/graysky2/kernel_compiler_patch/master/${_outdated}${_patch_name}.patch" || true
-    tkgpatch="${_patch_location}/${_patch_name}.patch"
-    if [ -e "$tkgpatch" ]; then
-      _msg="Applying graysky's cpu opts patch" && _tkg_patcher
-    else
-      msg2 "Couldn't find graysky's cpu opts patch for this version"
-    fi
+
+  wget -O "${_patch_location}/${_patch_name}.patch" "https://raw.githubusercontent.com/graysky2/kernel_compiler_patch/master/${_outdated}${_patch_name}.patch" || true
+  tkgpatch="${_patch_location}/${_patch_name}.patch"
+  if [ -e "$tkgpatch" ]; then
+    _msg="Applying graysky's cpu opts patch" && _tkg_patcher
   else
-    _processor_opt="generic"
+    msg2 "Couldn't find graysky's cpu opts patch for this version"
   fi
 
   # PREEMPT_RT patch