diff --git a/srcpkgs/laptop-mode/files/laptop-mode/finish b/srcpkgs/laptop-mode/files/laptop-mode/finish
new file mode 100644
index 0000000000..ea26eede24
--- /dev/null
+++ b/srcpkgs/laptop-mode/files/laptop-mode/finish
@@ -0,0 +1,3 @@
+#/bin/sh
+laptop_mode init stop
+rm -f /var/run/laptop-mode-tools/enabled
diff --git a/srcpkgs/laptop-mode/files/laptop-mode/run b/srcpkgs/laptop-mode/files/laptop-mode/run
new file mode 100644
index 0000000000..8d8e154ec8
--- /dev/null
+++ b/srcpkgs/laptop-mode/files/laptop-mode/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+laptop_mode init auto
+exec chpst -b laptop-mode pause
diff --git a/srcpkgs/laptop-mode/template b/srcpkgs/laptop-mode/template
index 376fcb13d7..94f14e1c57 100644
--- a/srcpkgs/laptop-mode/template
+++ b/srcpkgs/laptop-mode/template
@@ -1,7 +1,7 @@
 # Template file for 'laptop-mode'
 pkgname=laptop-mode
 version=1.66
-revision=1
+revision=2
 noarch=yes
 wrksrc="${pkgname}-tools_${version}"
 short_desc="Laptop power saving package for Linux systems"
@@ -26,7 +26,6 @@ conf_files="
 	/etc/laptop-mode/conf.d/intel-hda-powersave.conf
 	/etc/laptop-mode/conf.d/configuration-file-control.conf
 	/etc/laptop-mode/conf.d/bluetooth.conf
-	/etc/laptop-mode/conf.d/usb-autosuspend.conf
 	/etc/laptop-mode/conf.d/wireless-ipw-power.conf
 	/etc/laptop-mode/conf.d/start-stop-programs.conf
 	/etc/laptop-mode/conf.d/ac97-powersave.conf
@@ -45,4 +44,5 @@ do_install() {
 	sed -i 's|/sbin/udevadm|/usr/bin/udevadm|g' usr/share/laptop-mode-tools/modules/hdparm
 	DESTDIR=${DESTDIR} ACPI=force APM=disabled INIT_D=none \
 		INSTALL=install LIB_D=/usr/lib MAN_D=/usr/share/man $wrksrc/install.sh
+	vsv laptop-mode
 }