diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index 210ff9faef9ee5579583c81810a7c2bc5f95375c..d6e310059a8dfb4b55ebd659369d953b4bf21898 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -259,3 +259,4 @@ ab55a18a95e1990a588929d5d29db3eb9985fea0 jdk9-b11
 4e3aa9723e9972623e3dafc321b368e7db7e9b3b jdk9-b14
 b114474fb25af4e73cb7219f7c04bd8994da03a5 jdk9-b15
 cf22a728521f91a4692b433d39d730a0a1b23155 jdk9-b16
+24152ee0ee1abef54a8bab04c099261dba7bcca5 jdk9-b17
diff --git a/corba/.hgtags b/corba/.hgtags
index a021d9325799f1542edc8205b6e0715b67ed288e..0a46f62c13b73e342a329efbcb6d5c12ef1a2b3f 100644
--- a/corba/.hgtags
+++ b/corba/.hgtags
@@ -259,3 +259,4 @@ e212cdcc8c11f0ba5acf6f5ddb596c4c545a93f9 jdk9-b12
 a2b82f863ba95a596da555a4c1b871c404863e7e jdk9-b14
 e54022d0dd92106fff7f7fe670010cd7e6517ee3 jdk9-b15
 422ef9d29d84f571453f015c4cb8713c3af70ee4 jdk9-b16
+4c75c2ca7cf3e0618315879acf17f42c8fcd0c09 jdk9-b17
diff --git a/hotspot/.hgtags b/hotspot/.hgtags
index 43e10fc2ccdf7616fd4c57794d799d594c717942..e58c5c77d48336cdf710a848fa437f10e5cd6ab4 100644
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -419,3 +419,4 @@ ebc44d040cd149d2120d69fe183a3dae7840f4b4 jdk9-b10
 bd333491bb6c012d7b606939406d0fa9a5ac7ffd jdk9-b14
 170f6d733d7aec062f743a6b8c1cce940a7a984a jdk9-b15
 b14e7c0b7d3ec04127f565cda1d84122e205680c jdk9-b16
+14b656df31c2cb09c505921061e79977823de71a jdk9-b17
diff --git a/hotspot/make/jprt.properties b/hotspot/make/jprt.properties
index fc6740c77b016e0cd8be11982f11802b990e21cf..eea0ef533911a0b4b961460d9b4ef780de69eef3 100644
--- a/hotspot/make/jprt.properties
+++ b/hotspot/make/jprt.properties
@@ -47,10 +47,10 @@ jprt.sync.push=false
 #       sparc etc.
 
 # Define the Solaris platforms we want for the various releases
-jprt.my.solaris.sparcv9.jdk9=solaris_sparcv9_5.10
+jprt.my.solaris.sparcv9.jdk9=solaris_sparcv9_5.11
 jprt.my.solaris.sparcv9=${jprt.my.solaris.sparcv9.${jprt.tools.default.release}}
 
-jprt.my.solaris.x64.jdk9=solaris_x64_5.10
+jprt.my.solaris.x64.jdk9=solaris_x64_5.11
 jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}}
 
 jprt.my.linux.i586.jdk9=linux_i586_2.6
diff --git a/jaxp/.hgtags b/jaxp/.hgtags
index e7c3b4c5d142d88a6c8dc8ab93ea3c2639b6c370..5f5830a03eab612c04186abf262f7768781da44c 100644
--- a/jaxp/.hgtags
+++ b/jaxp/.hgtags
@@ -259,3 +259,4 @@ e88cecf5a21b760ff7d7761c2db6bb8c82bc9f0c jdk9-b12
 32b3fc4bc7374a34d52b7f4e2391b4b4b0c084e8 jdk9-b14
 6bad71866c7598587860e0981b0b0e51ec8c0476 jdk9-b15
 a1461221b05d4620e4d7d1907e2a0282aaedf31c jdk9-b16
+6f923fcbe5129eceb9617a9a18dbdd743980e785 jdk9-b17
diff --git a/jaxws/.hgtags b/jaxws/.hgtags
index b6167002ea2f3682f178478845579ee1d7688b7c..ce037a884fb487ad965384d96fa3ba9a58fe904a 100644
--- a/jaxws/.hgtags
+++ b/jaxws/.hgtags
@@ -262,3 +262,4 @@ c9e8bb8c1144a966ca7b481142c6b5e55d14a29c jdk9-b09
 02e58850b7062825308413d420f2b02c1f25a724 jdk9-b14
 e9780330017a6b464a385356d77e5136f9de8d09 jdk9-b15
 1e1a3b2215b7551d88e89d1ca8c1e1ebe3d3c0ab jdk9-b16
+6b159e727dac283f424b7d19f5be3ddd9f85acf5 jdk9-b17
diff --git a/jdk/.hgtags b/jdk/.hgtags
index 1d0fd47c3130b9bb6596ae56212e5046372ce68b..5a5e1675cba00cff40c5dd3532a2423ad0de9cee 100644
--- a/jdk/.hgtags
+++ b/jdk/.hgtags
@@ -259,3 +259,4 @@ c7c8002d02721e02131d104549ebeb8b379fb8d2 jdk9-b13
 5c7a17a81afd0906b53ee31d95a3211c96ff6b25 jdk9-b14
 4537360f09fe23ab339ee588747b657feb12d0c8 jdk9-b15
 ab7d2c565b0de5bee1361d282d4029371327fc9e jdk9-b16
+fd8e675f141b9bdb2f46d1ae8251f4ee3a895d64 jdk9-b17
diff --git a/make/jprt.properties b/make/jprt.properties
index 081ac7e9dec2db974eefb7e74b7e0e959dd1e9a8..6e79202c37aec157676071e05740778da4c0f898 100644
--- a/make/jprt.properties
+++ b/make/jprt.properties
@@ -25,7 +25,7 @@
 
 # Properties for jprt
 
-# Locked down to jdk8
+# Locked down to jdk9
 jprt.tools.default.release=jdk9
 
 # Unix toolkit to use for building on windows
@@ -36,8 +36,8 @@ jprt.build.flavors=product,fastdebug
 
 # Standard list of jprt build targets for this source tree
 jprt.build.targets= 						\
-    solaris_sparcv9_5.10-{product|fastdebug}, 			\
-    solaris_x64_5.10-{product|fastdebug}, 			\
+    solaris_sparcv9_5.11-{product|fastdebug}, 			\
+    solaris_x64_5.11-{product|fastdebug}, 			\
     linux_i586_2.6-{product|fastdebug}, 			\
     linux_x64_2.6-{product|fastdebug}, 				\
     macosx_x64_10.7-{product|fastdebug}, 			\
@@ -49,8 +49,8 @@ jprt.my.test.set=${jprt.test.set}
 
 # Test target list (no fastdebug & limited c2 testing)
 jprt.my.test.target.set= \
-    solaris_sparcv9_5.10-product-c2-TESTNAME, 			\
-    solaris_x64_5.10-product-c2-TESTNAME, 			\
+    solaris_sparcv9_5.11-product-c2-TESTNAME, 			\
+    solaris_x64_5.11-product-c2-TESTNAME, 			\
     linux_i586_2.6-product-{c1|c2}-TESTNAME, 			\
     linux_x64_2.6-product-c2-TESTNAME, 				\
     macosx_x64_10.7-product-c2-TESTNAME, 			\
@@ -131,8 +131,8 @@ jprt.make.rule.pit.test.targets=                                \
 
 # JCK test targets in test/Makefile (no windows)
 jprt.my.jck.test.target.set=					\
-    solaris_sparcv9_5.10-product-c2-JCK7TESTRULE, 		\
-    solaris_x64_5.10-product-c2-JCK7TESTRULE, 			\
+    solaris_sparcv9_5.11-product-c2-JCK7TESTRULE, 		\
+    solaris_x64_5.11-product-c2-JCK7TESTRULE, 			\
     linux_i586_2.6-product-c1-JCK7TESTRULE, 			\
     linux_x64_2.6-product-c2-JCK7TESTRULE
 
diff --git a/nashorn/.hgtags b/nashorn/.hgtags
index 31e3bb7761734b851d33976d85e3060e6d3b6ef5..382ab103d08b7c4aa78b23d3f98ea7b619d9a93b 100644
--- a/nashorn/.hgtags
+++ b/nashorn/.hgtags
@@ -250,3 +250,4 @@ be4580ae56e2ef0ce521d3f840753eaa83cacf33 jdk9-b13
 806df06b6ac58d3e9c9c6a680dbdd7a6c94ca700 jdk9-b14
 32b66f4661eac52f8b04fb3d7703feb2c96febb7 jdk9-b15
 fed8c83dfba4dce94d2ae1cb82f026634ff2a3e4 jdk9-b16
+4a47b7cfecdf2a865811ab08a7ef49c942801d7c jdk9-b17