diff --git a/.travis.yml b/.travis.yml
index 1fe70a45..065508c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,8 +7,8 @@ git:
 # only run travis on the master branch
 branches:
   only:
-    - master
-    - Rel20
+    - release20
+    - develop21
 
 # build with both gcc and clang to ensure compatibility
 compiler:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85dbeab3..1d0b5053 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,7 @@ if(POLICY CMP0043)
 endif()
 
 project(MaNGOS)
-set(MANGOS_VERSION 0.20)
+set(MANGOS_VERSION 0.21)
 
 set(CMAKE_MODULE_PATH
   "${CMAKE_MODULE_PATH}"
diff --git a/src/shared/SystemConfig.h.in b/src/shared/SystemConfig.h.in
index 2d9df341..afba4f8b 100644
--- a/src/shared/SystemConfig.h.in
+++ b/src/shared/SystemConfig.h.in
@@ -33,7 +33,7 @@
 
 #ifndef MANGOS_VERSION
 #if PLATFORM == PLATFORM_WINDOWS
-# define MANGOS_VERSION(REVD,REVT,REVN,REVH) "0.20.0" " (" REVD " " REVT " Revision " REVN " - " REVH ")"
+# define MANGOS_VERSION(REVD,REVT,REVN,REVH) "0.21.0" " (" REVD " " REVT " Revision " REVN " - " REVH ")"
 #else
 # define MANGOS_VERSION(REVD,REVT,REVN,REVH) "@VERSION@" " (" REVD " " REVT " Revision " REVN " - " REVH ")"
 #endif
diff --git a/src/shared/revision.h b/src/shared/revision.h
index 21ed9393..30bd0c65 100644
--- a/src/shared/revision.h
+++ b/src/shared/revision.h
@@ -24,8 +24,8 @@
 
 #ifndef MANGOS_H_REVISION
 #define MANGOS_H_REVISION
-#define REVISION_NR "20007"
+#define REVISION_NR "21000"
 #define REVISION_DB_CHARACTERS "required_20005_01_characters_pvpstats"
-#define REVISION_DB_MANGOS "required_20007_01_Rel20_Release_Prep"
+#define REVISION_DB_MANGOS "required_21000_01_Release21_initial"
 #define REVISION_DB_REALMD "required_20140607_Realm_Resync"
 #endif // __REVISION_H__