diff --git a/aur/monkey/PKGBUILD b/aur/monkey/PKGBUILD
index a65b24414..ce199fcac 100644
--- a/aur/monkey/PKGBUILD
+++ b/aur/monkey/PKGBUILD
@@ -1,19 +1,27 @@
 #Maintainer: Christian Stankowic <info at stankowic hypen development dot net>
 #Contributor: Gary Wright <wriggary at gmail dot com>
+
+#AKARM: moonman
+#      -added .service file for systemd
+#      -changed default port to 80 (required by .service)
+#      -changed pid file dir from /var/log to /var/run/monkey
+
 pkgname=monkey
 pkgver=1.1.1
 pkgrel=1
 pkgdesc="A very small and fast open source web server for Linux"
-arch=('i686' 'x86_64')
+arch=('arm')
 url="http://www.monkey-project.com/"
 license=('GPL2')
 depends=('gcc-libs')
 optdepends=('php')
 source=("http://www.monkey-project.com/releases/1.1/$pkgname-$pkgver.tar.gz"
-    monkey)
+    monkey
+    monkey.service)
 install=monkey.install
 md5sums=('958d74ddcc595ae01b1d3916e9e7753c'
-         '1527d1fbddddcfd69ad328639dcd0eed')
+         '1527d1fbddddcfd69ad328639dcd0eed'
+         '7881f60a6e9c4b2a43a6fe0d7b251362')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -22,6 +30,14 @@ build() {
   --plugdir=/usr/lib/$pkgname
   make 
   make DESTDIR=$pkgdir install
-  install -d $pkgdir/etc/rc.d/
+
+  #change default pid file location from /var/log to /var/run/monkey
+  sed -i -e "s/\/var\/log\/monkey\/monkey.pid/\/var\/run\/monkey\/monkey.pid/" $startdir/pkg/etc/monkey/monkey.conf
+
+  #change default port to 80
+  sed -i -e "s/Port\ 2001/Port\ 80/" $startdir/pkg/etc/monkey/monkey.conf
+
+  install -d $pkgdir/etc/rc.d/ 
   install -m 755 ../monkey $pkgdir/etc/rc.d/monkey
+  install -Dm644 "$srcdir/$pkgname.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service"
 }
diff --git a/aur/monkey/monkey.install b/aur/monkey/monkey.install
index a42e4c01c..a0041abba 100644
--- a/aur/monkey/monkey.install
+++ b/aur/monkey/monkey.install
@@ -1,14 +1,14 @@
 
 post_install() {
+       mkdir -p var/run/monkey
+       chmod 755 var/run/monkey
+
        env echo 
        env echo  " Running Monkey :"
        env echo  " ----------------"
        env echo 
        env echo  "  # /usr/bin/monkey"
        env echo 
-       env echo  "  For more help use '-h' option"        
-       env echo 
-       env echo  "  System wide rc script located at:"
-       env echo
-       env echo  "  # /etc/rc.d/monkey {start|stop|restart}"
+       env echo  "  For more help use '-h' option"
 }
+
diff --git a/aur/monkey/monkey.service b/aur/monkey/monkey.service
new file mode 100644
index 000000000..18dcbd113
--- /dev/null
+++ b/aur/monkey/monkey.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Monkey http server deamon
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/monkey -D
+ExecStop=/bin/kill $MAINPID
+ExecReload=/bin/kill $MAINPID ; /usr/bin/monkey -D
+PIDFile=/var/run/monkey/monkey.pid.80
+
+[Install]
+WantedBy=multi-user.target