diff --git a/.hgtags b/.hgtags
index 57a200e545a6fc98cde2f661e456b68de5ff9586..df06313deca45f5c57f686e7280905caa738c584 100644
--- a/.hgtags
+++ b/.hgtags
@@ -83,3 +83,6 @@ fafab5d5349c7c066d677538db67a1ee0fb33bd2 hs15-b05
 ffc8d176b84bcfb5ac21302b4feb3b0c0d69b97c jdk7-b84
 6c9796468b91dcbb39e09dfa1baf9779ac45eb66 jdk7-b85
 418bc80ce13995149eadc9eecbba21d7a9fa02ae hs17-b10
+bf823ef06b4f211e66988d76a2e2669be5c0820e jdk7-b86
+07226e9eab8f74b37346b32715f829a2ef2c3188 hs18-b01
+e7e7e36ccdb5d56edd47e5744351202d38f3b7ad jdk7-b87
diff --git a/make/hotspot_version b/make/hotspot_version
index b6f0792ede5c2224af4e73d3428bbbc80325e522..920a9d901a249749cf7fe9f02423a7695e07d4f6 100644
--- a/make/hotspot_version
+++ b/make/hotspot_version
@@ -31,11 +31,11 @@
 #
 
 # Don't put quotes (fail windows build).
-HOTSPOT_VM_COPYRIGHT=Copyright 2009
+HOTSPOT_VM_COPYRIGHT=Copyright 2010
 
-HS_MAJOR_VER=17
+HS_MAJOR_VER=18
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=10
+HS_BUILD_NUMBER=02
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7