diff --git a/Doxygen/arango.template b/Doxygen/arango.template
index 1315bbc311..26f4f6cea2 100644
--- a/Doxygen/arango.template
+++ b/Doxygen/arango.template
@@ -31,7 +31,7 @@ PROJECT_NAME           = "ArangoDB"
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = 0.5.2
+PROJECT_NUMBER         = 0.6.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description for a project that appears at the top of each page and should give viewer a quick idea about the purpose of the project. Keep the description short.
 
@@ -212,7 +212,7 @@ ALIASES += GE{1}="<b>\1</b>"
 ALIASES += EXAMPLES="<b>Examples</b><br>"
 ALIASES += EXAMPLE{2}="@latexonly\renewcommand{\examplecap}{\2}\setboolean{hascap}{true}@endlatexonly@verbinclude \1@latexonly\setboolean{hascap}{false}@endlatexonly"
 ALIASES += TINYEXAMPLE{2}="@latexonly\renewcommand{\examplecap}{\2}\setboolean{hascap}{true}\renewcommand{\examplesize}{\tiny}@endlatexonly@verbinclude \1@latexonly\setboolean{hascap}{false}\renewcommand{\examplesize}{\ttfamily}@endlatexonly"
-ALIASES += VERSION="0.5.2"
+ALIASES += VERSION="0.6.0"
 ALIASES += EMBEDTOC{1}="@ifnot LATEX<hr>@copydoc \1<hr>@endif"
 ALIASES += RESTHEADER{2}="@if LATEX@latexonly \vskip 0.5em\colorbox{gray}{@endlatexonly\1 (\2)@latexonly}\vskip 1em@endlatexonly@else <hr><em>\1</em> (\2)<hr><br>@endif"
 ALIASES += LATEXBREAK="@latexonly\vskip -0.5em\hskip 1.0em@endlatexonly"
diff --git a/VERSION b/VERSION
index cb0c939a93..a918a2aa18 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.5.2
+0.6.0
diff --git a/configure b/configure
index a30c5f133a..0d4d6e4ef2 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for triAGENS ArangoDB 0.5.2.
+# Generated by GNU Autoconf 2.68 for triAGENS ArangoDB 0.6.0.
 #
 # Report bugs to <info@triagens.de>.
 #
@@ -560,8 +560,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='triAGENS ArangoDB'
 PACKAGE_TARNAME='arango'
-PACKAGE_VERSION='0.5.2'
-PACKAGE_STRING='triAGENS ArangoDB 0.5.2'
+PACKAGE_VERSION='0.6.0'
+PACKAGE_STRING='triAGENS ArangoDB 0.6.0'
 PACKAGE_BUGREPORT='info@triagens.de'
 PACKAGE_URL='http://www.arangodb.org'
 
@@ -1398,7 +1398,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures triAGENS ArangoDB 0.5.2 to adapt to many kinds of systems.
+\`configure' configures triAGENS ArangoDB 0.6.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1469,7 +1469,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of triAGENS ArangoDB 0.5.2:";;
+     short | recursive ) echo "Configuration of triAGENS ArangoDB 0.6.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1622,7 +1622,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-triAGENS ArangoDB configure 0.5.2
+triAGENS ArangoDB configure 0.6.0
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2087,7 +2087,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by triAGENS ArangoDB $as_me 0.5.2, which was
+It was created by triAGENS ArangoDB $as_me 0.6.0, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -3214,7 +3214,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='arango'
- VERSION='0.5.2'
+ VERSION='0.6.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -10112,7 +10112,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by triAGENS ArangoDB $as_me 0.5.2, which was
+This file was extended by triAGENS ArangoDB $as_me 0.6.0, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10179,7 +10179,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-triAGENS ArangoDB config.status 0.5.2
+triAGENS ArangoDB config.status 0.6.0
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 0e1d4221a5..812bb32e57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl ============================================================================
 dnl PREAMBLE                                     triAGENS GmbH Build Environment
 dnl ============================================================================
 
-AC_INIT([triAGENS ArangoDB], [0.5.2], [info@triagens.de], [arango], [http://www.arangodb.org])
+AC_INIT([triAGENS ArangoDB], [0.6.0], [info@triagens.de], [arango], [http://www.arangodb.org])
 
 dnl ----------------------------------------------------------------------------
 dnl auxillary directory for install-sh and missing