diff --git a/files/0002-enable_default_settings_in_conf.patch b/files/0002-enable_default_settings_in_conf.patch
--- a/files/0002-enable_default_settings_in_conf.patch
+++ b/files/0002-enable_default_settings_in_conf.patch
@@ -50,8 +50,8 @@
  
 -#CPU_SCALING_GOVERNOR_ON_AC=powersave
 -#CPU_SCALING_GOVERNOR_ON_BAT=powersave
-+CPU_SCALING_GOVERNOR_ON_AC=powersave
-+CPU_SCALING_GOVERNOR_ON_BAT=powersave
++CPU_SCALING_GOVERNOR_ON_AC=performance
++CPU_SCALING_GOVERNOR_ON_BAT=schedutil
  
  # Set the min/max frequency available for the scaling governor.
  # Possible values depend on your CPU. For available frequencies see
diff --git a/files/0003-speed-up-shutdown-suspend.patch b/files/0003-speed-up-shutdown-suspend.patch
new file mode 100644
--- /dev/null
+++ b/files/0003-speed-up-shutdown-suspend.patch
@@ -0,0 +1,64 @@
+From 8f24896d10e0283929e00e997050d5c5e329ef0b Mon Sep 17 00:00:00 2001
+From: Thomas Koch <linrunner@gmx.net>
+Date: Fri, 13 Nov 2020 15:00:16 +0100
+Subject: [PATCH] Speed up system shutdown/suspend
+
+Rationale: applying AC settings on shutdown and suspend
+costs 1-2 secs. In comparison, the time saved by the
+acceleration due to the AC settings is negligible.
+
+Measure: do not apply AC settings on shutdown and suspend.
+
+The old behaviour may be reinstated by configuring
+hidden parameters:
+
+  X_TLP_SHUTDOWN_ACMODE=1
+  X_TLP_SUSPEND_ACMODE=1
+---
+
+diff --git a/tlp.in b/tlp.in
+index b8f38de..7905a5a 100644
+--- a/tlp.in
++++ b/tlp.in
+@@ -297,11 +297,13 @@ case "$_cmd" in
+                 # clear saved power state
+                 clear_saved_power_state
+ 
+-                # apply ac settings for faster shutdown
+-                echo -n "Applying power save settings..."
+-                apply_common_settings 0
+-                poweroff_drivebay $pwrmode 0
+-                echo "done."
++                # DISABLED: apply ac settings
++                if [ "$X_TLP_SHUTDOWN_ACMODE" = "1" ]; then
++                    echo -n "Applying power save settings..."
++                    apply_common_settings 0
++                    poweroff_drivebay $pwrmode 0
++                    echo "done."
++                fi
+ 
+                 # disable usb autosuspend if configured
+                 if [ "$USB_AUTOSUSPEND_DISABLE_ON_SHUTDOWN" = "1" ]; then
+@@ -398,13 +400,16 @@ case "$_cmd" in
+ 
+     suspend) # handle suspend/hibernate
+         check_root
+-        if lock_tlp; then
+-            save_device_states "bluetooth wwan"
++        save_device_states "bluetooth wwan"
++        suspend_drivebay $pwrmode
+ 
+-            apply_common_settings 0
+-            suspend_drivebay $pwrmode
+-            save_runconf
+-            unlock_tlp
++        # DISABLED: apply ac settings
++        if [ "$X_TLP_SUSPEND_ACMODE" = "1" ]; then
++            if lock_tlp; then
++                apply_common_settings 0
++                save_runconf
++                unlock_tlp
++            fi
+         fi
+         ;;
+ 
diff --git a/files/series b/files/series
new file mode 100644
--- /dev/null
+++ b/files/series
@@ -0,0 +1,3 @@
+0001-Don-t-enable-tlp-service-on-virtualised-platforms.patch
+0002-enable_default_settings_in_conf.patch
+0003-speed-up-shutdown-suspend.patch
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
 name       : tlp
 version    : 1.3.1
-release    : 15
+release    : 16
 source     :
     - https://github.com/linrunner/TLP/archive/1.3.1.tar.gz : 4c783606ca6e98a3ddb3dc911785b4d7a73fec4ebb9decfca4ca15e315ece768
 license    : GPL-2.0-only
@@ -14,8 +14,7 @@
 rundeps    :
     - linux-tools-x86_energy_perf_policy
 setup      : |
-    %patch -p1 < $pkgfiles/0001-Don-t-enable-tlp-service-on-virtualised-platforms.patch
-    %patch -p1 < $pkgfiles/0002-enable_default_settings_in_conf.patch
+    %apply_patches
 build      : |
     export TLP_LIBDIR='%libdir%'
     export TLP_SBIN='/usr/sbin'
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
     <Source>
         <Name>tlp</Name>
         <Packager>
-            <Name>Albert Krenz</Name>
-            <Email>albert.krenz+solus@mailbox.org</Email>
+            <Name>Jarno Turkki</Name>
+            <Email>stalebrim@posteo.net</Email>
         </Packager>
         <License>GPL-2.0-only</License>
         <PartOf>system.utils</PartOf>
@@ -73,12 +73,12 @@
         </Files>
     </Package>
     <History>
-        <Update release="15">
-            <Date>2020-05-01</Date>
+        <Update release="16">
+            <Date>2020-12-28</Date>
             <Version>1.3.1</Version>
             <Comment>Packaging update</Comment>
-            <Name>Albert Krenz</Name>
-            <Email>albert.krenz+solus@mailbox.org</Email>
+            <Name>Jarno Turkki</Name>
+            <Email>stalebrim@posteo.net</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file