diff --git a/laptop-mode-tools/PKGBUILD b/laptop-mode-tools/PKGBUILD
index 07aea7766..f083a3ae2 100644
--- a/laptop-mode-tools/PKGBUILD
+++ b/laptop-mode-tools/PKGBUILD
@@ -1,11 +1,10 @@
 #
 # Chakra Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+# maintainer abveritas@chakra-project.org
 
 pkgname=laptop-mode-tools
-pkgver=1.60
+pkgver=1.61
 pkgrel=1
 pkgdesc="Laptop mode is a kernel mode that allows you to extend the battery life of your laptop"
 arch=('any')
@@ -39,15 +38,24 @@ backup=(etc/laptop-mode/conf.d/ac97-powersave.conf
         etc/laptop-mode/laptop-mode.conf
         etc/laptop-mode/lm-profiler.conf)
 source=("http://www.samwel.tk/laptop_mode/tools/downloads/${pkgname}_${pkgver}.tar.gz"
-        laptop-mode)
-md5sums=('22bcc955c4e5d28e2f3a992b0efb50b4'
-         'bae8d721e660fe420c9769a6db6856af')
+        laptop-mode laptop-mode-tools.service)
+md5sums=('6685af5dbb34c3d51ca27933b58f484e'
+         'bae8d721e660fe420c9769a6db6856af'
+         '585cc7f8b0961cfcb3fa2c08590f82dd')
+
+build() {
+  cd "$srcdir/${pkgname}_$pkgver"
+  sed -i 's@/lib/udev/@@g' etc/rules/99-laptop-mode.rules
+  sed -ri 's@(lib|etc)/udev@usr/lib/udev@g' install.sh
+}
 
 package() {
-  cd "${srcdir}/${pkgname}_${pkgver}"
-  sed -i 's|etc/udev|lib/udev|' install.sh
-  make DESTDIR="${pkgdir}" INIT_D=none MAN_D=/usr/share/man install
-  install -D -m755 "${srcdir}/laptop-mode" "${pkgdir}/etc/rc.d/laptop-mode"
+  cd "$srcdir/${pkgname}_$pkgver"
+  make DESTDIR="$pkgdir" INIT_D=none MAN_D=/usr/share/man install
+
+  install -D -m755 "$srcdir/laptop-mode" "$pkgdir/etc/rc.d/laptop-mode"
+  install -D -m644 "$srcdir/laptop-mode-tools.service" \
+                   "$pkgdir/usr/lib/systemd/system/laptop-mode-tools.service"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/laptop-mode-tools/laptop-mode-tools.service b/laptop-mode-tools/laptop-mode-tools.service
new file mode 100644
index 000000000..952584126
--- /dev/null
+++ b/laptop-mode-tools/laptop-mode-tools.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Laptop Power Saving Tools
+After=acpid.service
+Wants=acpid.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStartPre=/usr/bin/install -d /var/run/laptop-mode-tools ; /usr/bin/touch /var/run/laptop-mode-tools/enabled
+ExecStart=/usr/sbin/laptop_mode auto
+ExecStop=/usr/sbin/laptop_mode stop
+ExecStopPost=/bin/rm -f /var/run/laptop-mode-tools/enabled
+
+[Install]
+WantedBy=multi-user.target