diff --git a/app/Constants.php b/app/Constants.php
index 08c7851b29..650aee0b13 100644
--- a/app/Constants.php
+++ b/app/Constants.php
@@ -308,7 +308,7 @@ if (! defined('APP_NAME')) {
     define('NINJA_APP_URL', env('NINJA_APP_URL', 'https://app.invoiceninja.com'));
     define('NINJA_DOCS_URL', env('NINJA_DOCS_URL', 'http://docs.invoiceninja.com/en/latest'));
     define('NINJA_DATE', '2000-01-01');
-    define('NINJA_VERSION', '3.5.1' . env('NINJA_VERSION_SUFFIX'));
+    define('NINJA_VERSION', '3.6.0' . env('NINJA_VERSION_SUFFIX'));
 
     define('SOCIAL_LINK_FACEBOOK', env('SOCIAL_LINK_FACEBOOK', 'https://www.facebook.com/invoiceninja'));
     define('SOCIAL_LINK_TWITTER', env('SOCIAL_LINK_TWITTER', 'https://twitter.com/invoiceninja'));
diff --git a/docs/conf.py b/docs/conf.py
index 95dbd73251..e10a986998 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -57,9 +57,9 @@ author = u'Invoice Ninja'
 # built documents.
 #
 # The short X.Y version.
-version = u'3.5'
+version = u'3.6'
 # The full version, including alpha/beta/rc tags.
-release = u'3.5.1'
+release = u'3.6.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.