diff --git a/VERSION b/VERSION
index d70c8f8d89..52b0d2a456 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.6
+2018-05-dev
diff --git a/boot.php b/boot.php
index ab51094937..9fee420f24 100644
--- a/boot.php
+++ b/boot.php
@@ -39,7 +39,7 @@ require_once 'include/text.php';
 
 define('FRIENDICA_PLATFORM',     'Friendica');
 define('FRIENDICA_CODENAME',     'The Tazmans Flax-lily');
-define('FRIENDICA_VERSION',      '3.6');
+define('FRIENDICA_VERSION',      '2018-05-dev');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
 define('DB_UPDATE_VERSION',      1256);
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);
diff --git a/database.sql b/database.sql
index 591569ad5f..59460b8059 100644
--- a/database.sql
+++ b/database.sql
@@ -1,5 +1,5 @@
 -- ------------------------------------------
--- Friendica 2018-05-dev (Tazmans Flax-lilly)
+-- Friendica 2018-05-dev (The Tazmans Flax-lily)
 -- DB_UPDATE_VERSION 1256
 -- ------------------------------------------