diff --git a/CHANGELOG b/CHANGELOG
index c69d488a65..cf0bcd07bd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,13 +1,16 @@
-v3.3.6 (XXXX-XX-XX)
+v3.3.6 (2018-04-11)
 -------------------
 
-* Fixed internal issue #2237: AQL queries on collections with replicationFactor:
+* added hidden option `--query.registry-ttl` to control the lifetime of cluster AQL
+  query parts
+
+* fixed internal issue #2237: AQL queries on collections with replicationFactor:
   "satellite" crashed arangod in single server mode
 
-* Fixed restore of satellite collections: replicationFactor was set to 1 during
+* fixed restore of satellite collections: replicationFactor was set to 1 during
   restore
 
-* Fixed dump and restore of smart graphs:
+* fixed dump and restore of smart graphs:
   a) The dump will not include the hidden shadow collections anymore, they were dumped
      accidentially and only contain duplicated data.
   b) Restore will now ignore hidden shadow collections as all data is contained
@@ -23,7 +26,7 @@ v3.3.6 (XXXX-XX-XX)
   recreate your dataset in v3.3.6 (i.e. dumping and restoring) instead of doing
   a simple binary upgrade
 
-* added /_admin/status for debugging
+* added /_admin/status HTTP API for debugging purposes
 
 * added ArangoShell helper function for packaging all information about an
   AQL query so it can be run and analyzed elsewhere:
@@ -42,6 +45,7 @@ v3.3.6 (XXXX-XX-XX)
 
 * fixed internal issue #2215's FailedLeader timeout bug
 
+
 v3.3.5 (2018-03-28)
 -------------------
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9cafc958d7..054be633cf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,7 +81,7 @@ if (NOT DEFINED ARANGODB_VERSION_REVISION)
   set(ARANGODB_VERSION_REVISION   "6")
 endif()
 
-set(ARANGODB_PACKAGE_REVISION   "3")
+set(ARANGODB_PACKAGE_REVISION   "4")
 # version for the windows rc file needs to be numeric:
 if (ARANGODB_VERSION_REVISION GREATER -1)
   set(ARANGODB_NUMERIC_VERSION_REVISION "${ARANGODB_VERSION_REVISION}")
diff --git a/Documentation/Books/Manual/Administration/Configuration/GeneralArangod.md b/Documentation/Books/Manual/Administration/Configuration/GeneralArangod.md
index 97c771f4e4..5da79ad8ae 100644
--- a/Documentation/Books/Manual/Administration/Configuration/GeneralArangod.md
+++ b/Documentation/Books/Manual/Administration/Configuration/GeneralArangod.md
@@ -431,6 +431,18 @@ setting the option `--query.tracking` to *false*.
 The default value is *10.0*.
 
 
+### Query registry timeout
+
+`--query.registry-ttl value`
+
+The default timeout for AQL query parts to stay alive in the cluster. The default
+value is 600 seconds. Query parts that are not used for the configured amount of
+time will expire automatically and will be aborted. The value of this option 
+normally only needs to be increased for queries that are running longer than the
+default timeout value (600 seconds) and that time out. The option has no effect
+in single-server mode.
+
+
 ### Throw collection not loaded error
 
 `--database.throw-collection-not-loaded-error flag`