diff --git a/VERSION b/VERSION
index 8de60381ba..d70c8f8d89 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.6-rc
+3.6
diff --git a/boot.php b/boot.php
index caf645c048..2a75964062 100644
--- a/boot.php
+++ b/boot.php
@@ -36,8 +36,8 @@ use Friendica\Util\DateTimeFormat;
 require_once 'include/text.php';
 
 define('FRIENDICA_PLATFORM',     'Friendica');
-define('FRIENDICA_CODENAME',     'Asparagus');
-define('FRIENDICA_VERSION',      '3.6-rc');
+define('FRIENDICA_CODENAME',     'The Tazmans Flax-lily');
+define('FRIENDICA_VERSION',      '3.6');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
 define('DB_UPDATE_VERSION',      1256);
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);