diff --git a/build/version_number b/build/version_number
index 361be93c7ecc2df0d21e5941ea89baf82c961c7a..9dc9927ac109698a78120927d7b565df4ad4ca4e 100644
--- a/build/version_number
+++ b/build/version_number
@@ -1 +1 @@
-6.17/01
+6.17/02
diff --git a/core/base/inc/RVersion.h b/core/base/inc/RVersion.h
index 39d047eee8b4d91408fdbe246c902f988f767fe1..c4e4f0ef0e47263a3a2f0b0ab3605ee055e3ac10 100644
--- a/core/base/inc/RVersion.h
+++ b/core/base/inc/RVersion.h
@@ -14,10 +14,10 @@
  *
 */
 
-#define ROOT_RELEASE "6.17/01"
-#define ROOT_RELEASE_DATE "Nov 14 2018"
-#define ROOT_RELEASE_TIME "08:11:25"
+#define ROOT_RELEASE "6.17/02"
+#define ROOT_RELEASE_DATE "May 29 2019"
+#define ROOT_RELEASE_TIME "09:35:25"
 #define ROOT_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-#define ROOT_VERSION_CODE ROOT_VERSION(6,17,1) /* 397569 */
+#define ROOT_VERSION_CODE ROOT_VERSION(6,17,2) /* 397570 */
 
 #endif
diff --git a/rootx/src/rootcoreteam.h b/rootx/src/rootcoreteam.h
index b1f3fab33cc5850d80d075caf1272f7f0817bd95..96841f91ad0de29006970dd89d0ac3a96454bddd 100644
--- a/rootx/src/rootcoreteam.h
+++ b/rootx/src/rootcoreteam.h
@@ -1,41 +1,38 @@
 #ifndef ROOT_ROOTCoreTeam
 #define ROOT_ROOTCoreTeam
 
+// This file is automatically generated with names from "git shortlog".
+// with a terminating 0 - that is what our rootxx.cxx and rootx-cocoa.mm expect.
+// Do not modify this file directly but run "make version" or
+// "build/unix/coreteam.sh".
+
 namespace ROOT {
 namespace ROOTX {
 
-//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.
-//The array (or its elements actually) has an internal linkage
-//(it has a definition here, not in rootxx.cxx or rootx-cocoa.mm files.
-//Please, do not modify this file.
+const char *gROOTCoreTeam[] = {
+   "Rene Brun",
+   "Fons Rademakers",
+   "Philippe Canal",
+   "Axel Naumann",
+   "Olivier Couet",
+   "Lorenzo Moneta",
+   "Vassil Vassilev",
+   "Danilo Piparo",
+   "Gerardo Ganis",
+   "Bertrand Bellenot",
+   "Sergey Linev",
+   "Wouter Verkerke",
+   "Enrico Guiraud",
+   "Pere Mato Vila",
+   "Timur Pocheptsov",
+   "Guilherme Amadio",
+   "Matevz Tadel",
+   "Wim Lavrijsen",
+   "Ilka Antcheva",
+   "Enric Tejedor Saavedra",
+   0 };
 
-const char * gROOTCoreTeam[] = {
-	"Rene Brun",
-	"Fons Rademakers",
-	"Philippe Canal",
-	"Axel Naumann",
-	"Olivier Couet",
-	"Lorenzo Moneta",
-	"Vassil Vassilev",
-	"Gerardo Ganis",
-	"Bertrand Bellenot",
-	"Danilo Piparo",
-	"Wouter Verkerke",
-	"Timur Pocheptsov",
-	"Matevz Tadel",
-	"Pere Mato",
-	"Wim Lavrijsen",
-	"Ilka Antcheva",
-	"Paul Russo",
-	"Andrei Gheata",
-	"Anirudha Bose",
-	"Valeri Onuchine",
-        0};
-}
-}
+} // namespace ROOTX
+} // namespace ROOT
 
 #endif