diff --git a/.hgtags b/.hgtags
index 1f4c7f1203ab7732d63f643467ea5c58565f328c..dba7899a1e654e2d80b29d2718c9a40e8c415f92 100644
--- a/.hgtags
+++ b/.hgtags
@@ -179,3 +179,6 @@ c1a277c6022affbc6855bdfb039511e73fbe2395 jdk8-b54
 b85b44cced2406792cfb9baab1377ff03e7001d8 jdk8-b55
 76844579fa4b30929731115b237e477181a82394 jdk8-b56
 522dfac8ca4d07c0b74025d4ac3b6e5feefbb829 jdk8-b57
+9367024804874faf8e958adeb333682bab1c0c47 jdk8-b58
+dae9821589ccd2611bdf7084269b98e819091770 jdk8-b59
+e07f499b9dccb529ecf74172cf6ac11a195ec57a jdk8-b60
diff --git a/make/Defs-internal.gmk b/make/Defs-internal.gmk
index 6afea7062a6738cf0173880fc5325bba02555fa4..6f40f763bc9014588ecbea4883f888e05960e920 100644
--- a/make/Defs-internal.gmk
+++ b/make/Defs-internal.gmk
@@ -330,6 +330,10 @@ COMMON_BUILD_ARGUMENTS = \
     PREVIOUS_MINOR_VERSION=$(PREVIOUS_MINOR_VERSION) \
     PREVIOUS_MICRO_VERSION=$(PREVIOUS_MICRO_VERSION)
 
+ifdef OPENJDK
+  COMMON_BUILD_ARGUMENTS += OPENJDK=$(OPENJDK)
+endif
+
 ifdef ARCH_DATA_MODEL
   COMMON_BUILD_ARGUMENTS += ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)
 endif