diff --git a/Installation/ARM/rc.arangodb b/Installation/ARM/rc.arangodb
index d48810b902..7fb376fe88 100644
--- a/Installation/ARM/rc.arangodb
+++ b/Installation/ARM/rc.arangodb
@@ -37,16 +37,16 @@ start () {
     ( cd /var/run/arangodb && chown -R arangodb:arangodb . ) || exit 1
     ( cd $PIDDIR && chown arangodb:arangodb . ) || exit 1
 
-    if [ "$1" = "--upgrade" ]; then
-      $DAEMON -c $CONF --uid arangodb --gid arangodb --server.rest-server no $@
+    if [ "$1" = "--database.auto-upgrade" ]; then
+      $DAEMON -c $CONF --uid arangodb --gid arangodb --server.rest-server false $@
       RETVAL=$?
       log_end_msg $RETVAL
     else
-      $DAEMON -c $CONF --uid arangodb --gid arangodb --server.rest-server --log.foreground-tty no --database.check-version
+      $DAEMON -c $CONF --uid arangodb --gid arangodb --server.rest-server --log.foreground-tty false --database.check-version true
       RETVAL=$?
 
       if [ "$RETVAL" -eq 0 ];  then
-        $DAEMON -c $CONF --uid arangodb --gid arangodb --pid-file "$PIDFILE" --temp-path "/var/tmp/arangod" --log.foreground-tty no --supervisor $@
+        $DAEMON -c $CONF --uid arangodb --gid arangodb --pid-file "$PIDFILE" --temp-path "/var/tmp/arangod" --log.foreground-tty false --supervisor true $@
 	RETVAL=$?
 	log_end_msg $RETVAL
       else
diff --git a/Installation/rpm/rc.arangod.Centos b/Installation/rpm/rc.arangod.Centos
index 391b6081b5..d2b2d4ab36 100644
--- a/Installation/rpm/rc.arangod.Centos
+++ b/Installation/rpm/rc.arangod.Centos
@@ -36,14 +36,16 @@ start() {
   ulimit -S -n 131072 || true
 
   if [ "$1" = "--upgrade" ];  then
-    $ARANGO_BIN --uid arangodb --gid arangodb $@
+    # remove unsupported option --upgrade but pass --database.auto-upgrade to arangod
+    shift 
+    $ARANGO_BIN --uid arangodb --gid arangodb --database.auto-upgrade true $@
     RETVAL=$?
   else
-    $ARANGO_BIN --uid arangodb --gid arangodb --log.foreground-tty false --database.check-version
+    $ARANGO_BIN --uid arangodb --gid arangodb --log.foreground-tty false --database.check-version true
     RETVAL=$?
 
     if test $RETVAL -eq 0;  then
-      $ARANGO_BIN --uid arangodb --gid arangodb --log.foreground-tty false --pid-file "$pidfile" --temp.path "/var/tmp/arangod" --supervisor $@
+      $ARANGO_BIN --uid arangodb --gid arangodb --log.foreground-tty false --pid-file "$pidfile" --temp.path "/var/tmp/arangod" --supervisor true $@
       RETVAL=$?
     else
       echo "database version check failed, maybe need to run 'upgrade'?"
diff --git a/Installation/rpm/rc.arangod.OpenSuSE b/Installation/rpm/rc.arangod.OpenSuSE
index b95eb664b0..7389a2cb9d 100644
--- a/Installation/rpm/rc.arangod.OpenSuSE
+++ b/Installation/rpm/rc.arangod.OpenSuSE
@@ -56,14 +56,16 @@ start () {
     ulimit -S -n 131072 || true
 
     if [ "$1" = "--upgrade" ];  then
-      $ARANGO_BIN --uid arangodb --gid arangodb $@
+      # remove unsupported option --upgrade but pass --database.auto-upgrade to arangod
+      shift 
+      $ARANGO_BIN --uid arangodb --gid arangodb --database.auto-upgrade true $@
       rc_status -v
     else
-      $ARANGO_BIN --uid arangodb --gid arangodb --log.foreground-tty false --database.check-version
+      $ARANGO_BIN --uid arangodb --gid arangodb --log.foreground-tty false --database.check-version true
       RETVAL=$?
 
       if test $RETVAL -eq 0;  then
-        startproc $ARANGO_BIN --uid arangodb --gid arangodb --log.foreground-tty false --pid-file "$ARANGO_PIDFILE" --temp.path "/var/tmp/arangod" --supervisor $@ 
+        startproc $ARANGO_BIN --uid arangodb --gid arangodb --log.foreground-tty false --pid-file "$ARANGO_PIDFILE" --temp.path "/var/tmp/arangod" --supervisor true $@ 
         rc_status -v
       else
         echo "database version check failed, maybe need to run 'upgrade'?"
diff --git a/Installation/rpm/rc.arangod.OpenSuSE_13 b/Installation/rpm/rc.arangod.OpenSuSE_13
index cd8ba81a5f..e43b1274d0 100644
--- a/Installation/rpm/rc.arangod.OpenSuSE_13
+++ b/Installation/rpm/rc.arangod.OpenSuSE_13
@@ -56,14 +56,16 @@ start () {
     ulimit -S -n 131072 || true
 
     if [ "$1" = "--upgrade" ];  then
-      $ARANGO_BIN --uid arangodb --gid arangodb $@
+      # remove unsupported option --upgrade but pass --database.auto-upgrade to arangod
+      shift 
+      $ARANGO_BIN --uid arangodb --gid arangodb --database.auto-upgrade true $@
       rc_status -v
     else
-      $ARANGO_BIN --uid arangodb --gid arangodb --log.foreground-tty false --database.check-version
+      $ARANGO_BIN --uid arangodb --gid arangodb --log.foreground-tty false --database.check-version true
       RETVAL=$?
 
       if test $RETVAL -eq 0;  then
-        startproc $ARANGO_BIN --uid arangodb --gid arangodb --pid-file "$ARANGO_PIDFILE" --temp.path "/var/tmp/arangod" --log.foreground-tty false --supervisor $@ 
+        startproc $ARANGO_BIN --uid arangodb --gid arangodb --pid-file "$ARANGO_PIDFILE" --temp.path "/var/tmp/arangod" --log.foreground-tty false --supervisor true $@ 
         rc_status -v
       else
         echo "database version check failed, maybe need to run 'upgrade'?"