diff --git a/build/version_number b/build/version_number
index a2f553889063141ee89e2f3125e249aa23e7e66f..b56ba120839f3cfe61172a1b1397d1adcc46822a 100644
--- a/build/version_number
+++ b/build/version_number
@@ -1 +1 @@
-5.99/06
+6.00/00
diff --git a/core/base/inc/RVersion.h b/core/base/inc/RVersion.h
index 310a78f91714b223031c91c3adf1327ba0a27b74..7c7316f08a1c912a023530e5321c67aaf02211fb 100644
--- a/core/base/inc/RVersion.h
+++ b/core/base/inc/RVersion.h
@@ -14,12 +14,12 @@
  *
 */
 
-#define ROOT_RELEASE "5.99/06"
-#define ROOT_RELEASE_DATE "Apr  3 2014"
-#define ROOT_RELEASE_TIME "23:20:15"
-#define ROOT_GIT_COMMIT "v5-99-05-lhcb-415-gf256d69"
+#define ROOT_RELEASE "6.00/00"
+#define ROOT_RELEASE_DATE "May 30 2014"
+#define ROOT_RELEASE_TIME "15:37:17"
+#define ROOT_GIT_COMMIT "v5-99-06-967-gdd4636e"
 #define ROOT_GIT_BRANCH "heads/master"
-#define ROOT_VERSION_CODE 353030
+#define ROOT_VERSION_CODE 393216
 #define ROOT_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
 
 #endif
diff --git a/rootx/src/rootcoreteam.h b/rootx/src/rootcoreteam.h
index d3fabf3bc1416f182513bca79147a30ca985cb60..239edf1ef26b9f6e5eb450fe55b484120da727bd 100644
--- a/rootx/src/rootcoreteam.h
+++ b/rootx/src/rootcoreteam.h
@@ -4,40 +4,37 @@
 namespace ROOT {
 namespace ROOTX {
 
-//This array will be updated by external script, reading names from http://root.cern.ch/gitstats/authors.html.
-//The names are sorted in an alphabetical order.
-//Please note the structure: it should always like this - names as
+//This file is automatically generated with names from http://root.cern.ch/gitstats/authors.html.
+//The names are sorted in an alphabetical order (sorted by a family name).
+//Please note the structure: it should be always like this - names as
 //string literals in an array's initializer
-//with a terminating 0 - that's what our rootxx.cxx and rootx-cocoa.mm expect!!!
+//with a terminating 0 - that's what our rootxx.cxx and rootx-cocoa.mm expect.
 //The array (or its elements actually) has an internal linkage
 //(it has a definition here, not in rootxx.cxx or rootx-cocoa.mm files.
-//So this header can be included in different places (as soon as you know what you're doing).
 //Please, do not modify this file.
 
 const char * gROOTCoreTeam[] = {
-//[STRINGTOREPLACE
-"Ilka Antcheva",
-"Bertrand Bellenot",
-"Rene Brun",
-"Philippe Canal",
-"Olivier Couet",
-"Cristina Cristescu",
-"Gerardo Ganis",
-"Andrei Gheata",
-"Wim Lavrijsen",
-"Pere Mato",
-"Lorenzo Moneta",
-"Axel Naumann",
-"Valeri Onuchin",
-"Danilo Piparo",
-"Timur Pocheptsov",
-"Fons Rademakers",
-"Paul Russo",
-"Matevz Tadel",
-"Vassil Vassilev",
-"Wouter Verkerke",
-0};
-//STRINGTOREPLACE]
+	"Ilka Antcheva",
+	"Bertrand Bellenot",
+	"Rene Brun",
+	"Philippe Canal",
+	"Olivier Couet",
+	"Cristina Cristescu",
+	"Gerardo Ganis",
+	"Andrei Gheata",
+	"Wim Lavrijsen",
+	"Pere Mato",
+	"Lorenzo Moneta",
+	"Axel Naumann",
+	"Valeri Onuchine",
+	"Danilo Piparo",
+	"Timur Pocheptsov",
+	"Fons Rademakers",
+	"Paul Russo",
+	"Matevz Tadel",
+	"Vassil Vassilev",
+	"Wouter Verkerke",
+        0};
 }
 }