diff --git a/PKGBUILD b/PKGBUILD
index 90befa4..4d6aa34 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -48,7 +48,7 @@ else
 fi
 pkgname=("${pkgbase}" "${pkgbase}-headers")
 pkgver="${_basekernel}"."${_sub}"
-pkgrel=95
+pkgrel=96
 pkgdesc='Linux-tkg'
 arch=('x86_64') # no i686 in here
 url="http://www.kernel.org/"
diff --git a/linux-tkg-config/prepare b/linux-tkg-config/prepare
index 315bed1..cd973ad 100644
--- a/linux-tkg-config/prepare
+++ b/linux-tkg-config/prepare
@@ -890,12 +890,21 @@ _tkg_srcprep() {
   fi
 
   # default cpu gov
-  if [ "$_default_cpu_gov" = "performance" ]; then
-    sed -i -e 's/CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y/# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set/' ./.config
-    sed -i -e 's/# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set/CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y/' ./.config
-  elif [ "$_default_cpu_gov" = "ondemand" ]; then
-    sed -i -e 's/CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y/# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set/' ./.config
-    sed -i -e 's/# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set/CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y/' ./.config
+  if [ "$_basever" = "54" ] || [ "$_basever" = "57" ] || [ "$_basever" = "58" ]; then
+    if [ "$_default_cpu_gov" = "performance" ]; then
+      sed -i -e 's/CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y/# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set/' ./.config
+      sed -i -e 's/# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set/CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y/' ./.config
+    elif [ "$_default_cpu_gov" = "ondemand" ]; then
+      sed -i -e 's/CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y/# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set/' ./.config
+      sed -i -e 's/# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set/CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y/' ./.config
+    fi
+  else
+    if [ "$_default_cpu_gov" = "performance" ]; then
+      _custom_commandline+=" cpufreq.default_governor=performance"
+    elif [ "$_default_cpu_gov" = "ondemand" ]; then
+      _custom_commandline+=" cpufreq.default_governor=ondemand"
+    fi
+    msg2 "Command line set to \"$_custom_commandline\""
   fi
 
   # ACPI_CPUFREQ disablement