diff --git a/Installation/Debian/rc.arangodb b/Installation/Debian/rc.arangodb
index 50462464f7..e85f460824 100755
--- a/Installation/Debian/rc.arangodb
+++ b/Installation/Debian/rc.arangodb
@@ -26,7 +26,12 @@ start () {
     test -d $PIDDIR || mkdir $PIDDIR
     chown arangodb $PIDDIR
 
-    $DAEMON -c $CONF --pid-file "$PIDFILE" --supervisor $@
+    if [ "$1" == "--upgrade" ]; then
+      $DAEMON -c $CONF $@
+    else
+      $DAEMON -c $CONF --pid-file "$PIDFILE" --supervisor $@
+    fi
+
     RETVAL=$?
 
     log_end_msg $RETVAL
diff --git a/Installation/Linux/rc.arangod.Centos b/Installation/Linux/rc.arangod.Centos
index 29e9dc40d3..3b9ed8650e 100644
--- a/Installation/Linux/rc.arangod.Centos
+++ b/Installation/Linux/rc.arangod.Centos
@@ -29,7 +29,11 @@ start() {
   ARANGO_PIDDIR=`dirname $pidfile`
   test -d $ARANGO_PIDDIR || (mkdir $ARANGO_PIDDIR && chown arangodb $ARANGO_PIDDIR)
 
-  $ARANGO_BIN -c $ARANGO_SYSCONFIG --pid-file "$pidfile" --supervisor $@
+  if [ "$1" == "--upgrade" ];  then
+    $ARANGO_BIN -c $ARANGO_SYSCONFIG $@
+  else
+    $ARANGO_BIN -c $ARANGO_SYSCONFIG --pid-file "$pidfile" --supervisor $@
+  fi
 
   RETVAL=$?
   echo
diff --git a/Installation/Linux/rc.arangod.OpenSuSE b/Installation/Linux/rc.arangod.OpenSuSE
index b4f7161055..e751e8a180 100644
--- a/Installation/Linux/rc.arangod.OpenSuSE
+++ b/Installation/Linux/rc.arangod.OpenSuSE
@@ -47,7 +47,11 @@ start () {
     ARANGO_PIDDIR=`dirname $ARANGO_PIDFILE`
     test -d $ARANGO_PIDDIR || (mkdir $ARANGO_PIDDIR && chown arangodb $ARANGO_PIDDIR)
  
-    startproc $ARANGO_BIN -c $ARANGO_SYSCONFIG --pid-file "$ARANGO_PIDFILE" --supervisor $@ 
+    if [ "$1" == "--upgrade" ];  then
+      $ARANGO_BIN -c $ARANGO_SYSCONFIG $@ 
+    else
+      startproc $ARANGO_BIN -c $ARANGO_SYSCONFIG --pid-file "$ARANGO_PIDFILE" --supervisor $@ 
+    fi
 
     # Remember status and be verbose
     rc_status -v
diff --git a/Installation/Linux/rc.arangod.Ubuntu b/Installation/Linux/rc.arangod.Ubuntu
index 135ad8d8d0..9c3f6d3f2e 100644
--- a/Installation/Linux/rc.arangod.Ubuntu
+++ b/Installation/Linux/rc.arangod.Ubuntu
@@ -27,7 +27,12 @@ start () {
     test -d $PIDDIR || mkdir $PIDDIR
     chown arangodb $PIDDIR
 
-    $DAEMON -c $CONF --pid-file "$PIDFILE" --supervisor $@
+    if [ "$1" == "--upgrade" ]; then
+      $DAEMON -c $CONF $@
+    else
+      $DAEMON -c $CONF --pid-file "$PIDFILE" --supervisor $@
+    fi
+
     RETVAL=$?
 
     log_end_msg $RETVAL