diff --git a/make/defs.make b/make/defs.make
index c70b3db7afc4226f4d3b9656d782239054a3c8aa..25c0b168e33c56a154283b0419b04a220207cb20 100644
--- a/make/defs.make
+++ b/make/defs.make
@@ -116,6 +116,18 @@ endif
 # hotspot version definitions
 include $(GAMMADIR)/make/hotspot_version
 
+# When config parameter --with-update-version is defined,
+# Hotspot minor version should be set to that
+ifneq ($(JDK_UPDATE_VERSION),)
+  HS_MINOR_VER=$(JDK_UPDATE_VERSION)
+endif
+
+# When config parameter --with-build-number is defined,
+# Hotspot build number should be set to that
+ifneq ($(JDK_BUILD_NUMBER),)
+  HS_BUILD_NUMBER=$(subst b,,$(JDK_BUILD_NUMBER))
+endif
+
 # Java versions needed
 ifeq ($(PREVIOUS_JDK_VERSION),)
   PREVIOUS_JDK_VERSION=$(JDK_PREVIOUS_VERSION)
diff --git a/make/hotspot_version b/make/hotspot_version
index f64747c97a372826af7f4ac652a0daa19212c80b..b0b82b8617fdcac122ab9b5be5ddd705e35319e2 100644
--- a/make/hotspot_version
+++ b/make/hotspot_version
@@ -35,7 +35,7 @@ HOTSPOT_VM_COPYRIGHT=Copyright 2015
 
 HS_MAJOR_VER=25
 HS_MINOR_VER=66
-HS_BUILD_NUMBER=03
+HS_BUILD_NUMBER=00
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8