diff --git a/community/yaws/PKGBUILD b/community/yaws/PKGBUILD
index db72e9293..0e99be5b0 100644
--- a/community/yaws/PKGBUILD
+++ b/community/yaws/PKGBUILD
@@ -1,13 +1,14 @@
-# $Id: PKGBUILD 69781 2012-04-23 09:18:39Z ibiru $
+# $Id$
 # Maintainer: Vesa Kaihlavirta
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Patrick Smits <mail@patricksmits.net>
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.com>
 #  - remove -m32 command from configure
 
 pkgname=yaws
 pkgver=1.95
-pkgrel=1
+pkgrel=3
 pkgdesc='Yet Another Web Server, pure Erlang HTTP server/framework'
 arch=('x86_64' 'i686')
 url='http://yaws.hyber.org/'
@@ -16,8 +17,10 @@ depends=('pam' 'erlang')
 backup=('etc/yaws/yaws.conf')
 options=('!emptydirs')
 install=$pkgname.install
-source=("http://yaws.hyber.org/download/$pkgname-$pkgver.tar.gz")
-sha256sums=('e4efae836561f5e8a1324a5c9ab63fb82468e9dc93dc95cb4cb6248ab6b95406')
+source=("http://yaws.hyber.org/download/$pkgname-$pkgver.tar.gz"
+        "$pkgname.service")
+sha256sums=('e4efae836561f5e8a1324a5c9ab63fb82468e9dc93dc95cb4cb6248ab6b95406'
+            'cce672e0bc73f536186bdbb8ac139d8000db4bd67f5fdeff84fdc4b4f8bd84f9')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -38,6 +41,8 @@ package() {
   install -d "$pkgdir/usr/lib/erlang/lib"
   ln -s /usr/lib/yaws "$pkgdir/usr/lib/erlang/lib/$pkgname-$pkgver"
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 "$srcdir/$pkgname.service" \
+    "$pkgdir/usr/lib/systemd/system/$pkgname.service"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/yaws/yaws.service b/community/yaws/yaws.service
new file mode 100644
index 000000000..48f9bb8ef
--- /dev/null
+++ b/community/yaws/yaws.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=A fast lightweight webserver.
+After=syslog.target network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/yaws --daemon --heart
+ExecReload=/usr/bin/yaws --hup
+ExecStop=/usr/bin/yaws --stop
+
+[Install]
+WantedBy=multi-user.target