diff --git a/Documentation/Books/Users/ConfigureArango/README.mdpp b/Documentation/Books/Users/ConfigureArango/README.mdpp
index ae418a8e39..d5b9243372 100644
--- a/Documentation/Books/Users/ConfigureArango/README.mdpp
+++ b/Documentation/Books/Users/ConfigureArango/README.mdpp
@@ -32,8 +32,8 @@ version of the application
 Prints the version of the server and exits.
 
  
-!SUBSECTION Upgrade 
-`--upgrade`
+!SUBSECTION Database Upgrade 
+`--database.upgrade`
 
 Specifying this option will make the server perform a database upgrade at start. A database upgrade will first compare the version number stored in the file VERSION in the database directory with the current server version.
 
diff --git a/Documentation/Books/Users/FirstSteps/GettingFamiliar.mdpp b/Documentation/Books/Users/FirstSteps/GettingFamiliar.mdpp
index f915afc2a2..2371208752 100644
--- a/Documentation/Books/Users/FirstSteps/GettingFamiliar.mdpp
+++ b/Documentation/Books/Users/FirstSteps/GettingFamiliar.mdpp
@@ -37,7 +37,7 @@ If there is no such process, check the log file
 like
 
     2012-12-03T11:35:29Z [12882] ERROR Database directory version (1) is lower than server version (1.2).
-    2012-12-03T11:35:29Z [12882] ERROR It seems like you have upgraded the ArangoDB binary. If this is what you wanted to do, please restart with the --upgrade option to upgrade the data in the database directory.
-    2012-12-03T11:35:29Z [12882] FATAL Database version check failed. Please start the server with the --upgrade option
+    2012-12-03T11:35:29Z [12882] ERROR It seems like you have upgraded the ArangoDB binary. If this is what you wanted to do, please restart with the --database.upgrade option to upgrade the data in the database directory.
+    2012-12-03T11:35:29Z [12882] FATAL Database version check failed. Please start the server with the --database.upgrade option
 
-make sure to start the server once with the *--upgrade* option.
\ No newline at end of file
+make sure to start the server once with the *--database.upgrade* option.
diff --git a/Documentation/Books/Users/Installing/Compiling.mdpp b/Documentation/Books/Users/Installing/Compiling.mdpp
index 39de0e23be..58ecd1a9c2 100644
--- a/Documentation/Books/Users/Installing/Compiling.mdpp
+++ b/Documentation/Books/Users/Installing/Compiling.mdpp
@@ -288,5 +288,5 @@ system, e. g. `/etc` and `/var/lib`.
 
 When upgrading from a previous version of ArangoDB, please make sure you inspect
 ArangoDB's log file after an upgrade. It may also be necessary to start ArangoDB
-with the *--upgrade* parameter once to perform required upgrade or
+with the *--database.upgrade* parameter once to perform required upgrade or
 initialization tasks.
diff --git a/Documentation/Books/Users/Installing/Upgrading.mdpp b/Documentation/Books/Users/Installing/Upgrading.mdpp
index 76ee56fc03..d3d68e5ddf 100644
--- a/Documentation/Books/Users/Installing/Upgrading.mdpp
+++ b/Documentation/Books/Users/Installing/Upgrading.mdpp
@@ -8,7 +8,7 @@ To upgrade an existing ArangoDB database to a newer version of ArangoDB
 * Check the *CHANGELOG* and the [list of incompatible changes](../Upgrading/UpgradingChanges28.md) for API or other changes in the new version of ArangoDB and make sure your applications can deal with them
 * Stop the "old" arangod service or binary
 * Copy the entire "old" data directory to a safe place (that is, a backup)
-* Install the new version of ArangoDB and start the server with the *--upgrade* option once. This might write to the logfile of ArangoDB, so you may want to check the logs for any issues before going on.
+* Install the new version of ArangoDB and start the server with the *--database.upgrade* option once. This might write to the logfile of ArangoDB, so you may want to check the logs for any issues before going on.
 * Start the "new" arangod service or binary regularly and check the logs for any issues. When you're confident everything went well, you may want to check the database directory for any files with the ending *.old*. These files are created by ArangoDB during upgrades and can be safely removed manually later.
 
 If anything goes wrong during or shortly after the upgrade:
diff --git a/Documentation/Books/Users/Installing/Windows.mdpp b/Documentation/Books/Users/Installing/Windows.mdpp
index 1530a5d61d..e2ad4abd1d 100644
--- a/Documentation/Books/Users/Installing/Windows.mdpp
+++ b/Documentation/Books/Users/Installing/Windows.mdpp
@@ -109,7 +109,7 @@ database, and vice versa.
 
 To upgrade an EXISTING database created with a previous version of ArangoDB,
 please execute the server *arangod.exe* with the option
-*--upgrade*. Otherwise starting ArangoDB may fail with errors.
+*--database.upgrade*. Otherwise starting ArangoDB may fail with errors.
 
 Note that there is no harm in running the upgrade. So you should run this
 batch file if you are unsure of the database version you are using.