diff --git a/Installation/Debian/rc.arangodb b/Installation/Debian/rc.arangodb
index eb529cb101..fd27e3ab2b 100755
--- a/Installation/Debian/rc.arangodb
+++ b/Installation/Debian/rc.arangodb
@@ -18,13 +18,25 @@ DESC="arango database server"
 NAME="arangod"
 PIDDIR=/var/run/arangodb
 PIDFILE=/var/run/arangodb/arangod.pid
-CONF=/etc/arangodb/arangod.conf
+CONF=/etc/arangodb/arangod-uid.conf
 
 test -x $DAEMON || exit 0
 
 start () {
     test -d $PIDDIR || mkdir $PIDDIR
-    chown arangodb $PIDDIR
+    chown arangodb:arangodb $PIDDIR
+
+    if test -d /var/log/arangodb;  then
+      chown -R arangodb:arangodb /var/log/arangodb
+    fi
+
+    if test -d /var/lib/arangodb;  then
+      chown -R arangodb:arangodb /var/lib/arangodb
+    fi
+
+    if test -d /var/lib/arangodb-apps;  then
+      chown -R arangodb:arangodb /var/lib/arangodb-apps
+    fi
 
     if [ "$1" = "--upgrade" ]; then
       $DAEMON -c $CONF $@
diff --git a/Installation/Linux/rc.arangod.Centos b/Installation/Linux/rc.arangod.Centos
index 64f2d76d43..ab4a4a3fd5 100644
--- a/Installation/Linux/rc.arangod.Centos
+++ b/Installation/Linux/rc.arangod.Centos
@@ -14,7 +14,7 @@
 ARANGO_BIN=/usr/sbin/arangod
 test -x $ARANGO_BIN || exit 5
 
-ARANGO_SYSCONFIG=/etc/arangodb/arangod.conf
+ARANGO_SYSCONFIG=/etc/arangodb/arangod-uid.conf
 test -r $ARANGO_SYSCONFIG || exit 6
 
 pidfile=/var/run/arangodb/arangod.pid
@@ -27,7 +27,19 @@ start() {
   echo -n $"Starting $ARANGO_BIN: "
 
   ARANGO_PIDDIR=`dirname $pidfile`
-  test -d $ARANGO_PIDDIR || (mkdir $ARANGO_PIDDIR && chown arangodb $ARANGO_PIDDIR)
+  test -d $ARANGO_PIDDIR || (mkdir $ARANGO_PIDDIR && chown arangodb:arangodb $ARANGO_PIDDIR)
+
+  if test -d /var/log/arangodb;  then
+    chown -R arangodb:arangodb /var/log/arangodb
+  fi
+
+  if test -d /var/lib/arangodb;  then
+    chown -R arangodb:arangodb /var/lib/arangodb
+  fi
+
+  if test -d /var/lib/arangodb-apps;  then
+    chown -R arangodb:arangodb /var/lib/arangodb-apps
+  fi
 
   if [ "$1" = "--upgrade" ];  then
     $ARANGO_BIN -c $ARANGO_SYSCONFIG $@
diff --git a/Installation/Linux/rc.arangod.OpenSuSE b/Installation/Linux/rc.arangod.OpenSuSE
index 28e72f209f..440f6bed17 100644
--- a/Installation/Linux/rc.arangod.OpenSuSE
+++ b/Installation/Linux/rc.arangod.OpenSuSE
@@ -22,7 +22,7 @@
 ARANGO_BIN=/usr/sbin/arangod
 test -x $ARANGO_BIN || exit 5
 
-ARANGO_SYSCONFIG=/etc/arangodb/arangod.conf
+ARANGO_SYSCONFIG=/etc/arangodb/arangod-uid.conf
 test -r $ARANGO_SYSCONFIG || exit 6
 
 
@@ -45,8 +45,20 @@ rc_reset
 
 start () {
     ARANGO_PIDDIR=`dirname $ARANGO_PIDFILE`
-    test -d $ARANGO_PIDDIR || (mkdir $ARANGO_PIDDIR && chown arangodb $ARANGO_PIDDIR)
- 
+    test -d $ARANGO_PIDDIR || (mkdir $ARANGO_PIDDIR && chown arangodb:arangodb $ARANGO_PIDDIR)
+
+    if test -d /var/log/arangodb;  then
+      chown -R arangodb:arangodb /var/log/arangodb
+    fi
+
+    if test -d /var/lib/arangodb;  then
+      chown -R arangodb:arangodb /var/lib/arangodb
+    fi
+
+    if test -d /var/lib/arangodb-apps;  then
+      chown -R arangodb:arangodb /var/lib/arangodb-apps
+    fi
+
     if [ "$1" = "--upgrade" ];  then
       $ARANGO_BIN -c $ARANGO_SYSCONFIG $@ 
     else
diff --git a/Installation/Linux/rc.arangod.Ubuntu b/Installation/Linux/rc.arangod.Ubuntu
index 18dcce1588..8a21405f54 100644
--- a/Installation/Linux/rc.arangod.Ubuntu
+++ b/Installation/Linux/rc.arangod.Ubuntu
@@ -19,13 +19,25 @@ DESC="ArangoDB"
 NAME="arangod"
 PIDDIR=/var/run/arangodb
 PIDFILE=${PIDDIR}/arangod.pid
-CONF=/etc/arangodb/arangod.conf
+CONF=/etc/arangodb/arangod-uid.conf
 
 test -x $DAEMON || exit 0
 
 start () {
     test -d $PIDDIR || mkdir $PIDDIR
-    chown arangodb $PIDDIR
+    chown arangodb:arangodb $PIDDIR
+
+    if test -d /var/log/arangodb;  then
+      chown -R arangodb:arangodb /var/log/arangodb
+    fi
+
+    if test -d /var/lib/arangodb;  then
+      chown -R arangodb:arangodb /var/lib/arangodb
+    fi
+
+    if test -d /var/lib/arangodb-apps;  then
+      chown -R arangodb:arangodb /var/lib/arangodb-apps
+    fi
 
     if [ "$1" = "--upgrade" ]; then
       $DAEMON -c $CONF $@
diff --git a/arangod/CMakeLists.txt b/arangod/CMakeLists.txt
index 94fd1dbc79..9a1457672e 100644
--- a/arangod/CMakeLists.txt
+++ b/arangod/CMakeLists.txt
@@ -158,9 +158,14 @@ endif ()
 
 if (BUILD_PACKAGE STREQUAL "raspbian")
   install(
-    FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangod-uid-arm.conf
+    FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangod-arm.conf
     DESTINATION ${ETCDIR_NATIVE}
     RENAME arangod.conf)
+
+  install(
+    FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangod-uid-arm.conf
+    DESTINATION ${ETCDIR_NATIVE}
+    RENAME arangod-uid.conf)
 else ()
   install(
     FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangod.conf