diff --git a/.hgtags b/.hgtags
index 149f29103e07e6b5db21cbe341eee638204c2b3a..4d1675f43e485d03d65ca03991a18c5821314593 100644
--- a/.hgtags
+++ b/.hgtags
@@ -887,6 +887,7 @@ d6007fa4ffae140f4c4ad551a1ee290a0704a094 jdk8u191-b02
 a8e49c4cae5e46b748ac9ddbc0befc87fea2a7d1 jdk8u191-b06
 2b457fbca0fc5bdf8e19cc0435fb989edcc15b36 jdk8u191-b07
 e5404b63db4a10aae7fa4a5639af5e08518c31e7 jdk8u191-b08
+4c2d3b4689ab5d92c42a4d1e1fa79db16de7bf06 jdk8u191-b09
 3b5b53db61f2aaa5a94fd9ca51162d83565faabe jdk8u182-b00
 dcfe85bcd9017741198b4e4a2045fdaaab212c74 jdk8u192-b00
 7abd14dd301d8a927450a7623c2e5913a5bfa891 jdk8u192-b01
@@ -897,3 +898,4 @@ dcfe85bcd9017741198b4e4a2045fdaaab212c74 jdk8u192-b00
 b88b6acd0e11adba0de591e562ca14d1d3d4347a jdk8u192-b06
 b96c7dda62dae179c8b885942d51b5f5f1e0905f jdk8u192-b07
 8f51ed70d93378f70d0288f8795f0bb0c64a6283 jdk8u192-b08
+d7057bcda329b0b4368d34465caefef5b3b15f0b jdk8u192-b09
diff --git a/common/autoconf/flags.m4 b/common/autoconf/flags.m4
index 9ef9b1a5e72032ec57556ebae18ea4caae111541..c586b7fcdde9728651e89ea6e0cc1c22f85edefa 100644
--- a/common/autoconf/flags.m4
+++ b/common/autoconf/flags.m4
@@ -108,7 +108,7 @@ AC_DEFUN_ONCE([FLAGS_SETUP_INIT_FLAGS],
         -d \"JDK_BUILD_ID=\$(FULL_VERSION)\" \
         -d \"JDK_COMPANY=\$(COMPANY_NAME)\" \
         -d \"JDK_COMPONENT=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) binary\" \
-        -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0).\$(COOKED_BUILD_NUMBER)\" \
+        -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(COOKED_JDK_UPDATE_VERSION).\$(COOKED_BUILD_NUMBER)\" \
         -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
         -d \"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(JDK_MINOR_VERSION) \$(JDK_UPDATE_META_TAG)\" \
         -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\""
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
index ade19fa7252d831e680e5ce3b0fd9919f3c6a14f..a977a2e08adf8e2efb440150aab516df126f8442 100644
--- a/common/autoconf/generated-configure.sh
+++ b/common/autoconf/generated-configure.sh
@@ -4336,7 +4336,7 @@ VS_SDK_PLATFORM_NAME_2017=
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1533314440
+DATE_WHEN_GENERATED=1536078152
 
 ###############################################################################
 #
@@ -40504,7 +40504,7 @@ $as_echo "$tool_specified" >&6; }
         -d \"JDK_BUILD_ID=\$(FULL_VERSION)\" \
         -d \"JDK_COMPANY=\$(COMPANY_NAME)\" \
         -d \"JDK_COMPONENT=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) binary\" \
-        -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0).\$(COOKED_BUILD_NUMBER)\" \
+        -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(COOKED_JDK_UPDATE_VERSION).\$(COOKED_BUILD_NUMBER)\" \
         -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
         -d \"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(JDK_MINOR_VERSION) \$(JDK_UPDATE_META_TAG)\" \
         -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\""