diff -r d1d9eb953fbb -r 17e06bbf496e common/autoconf/jdk-options.m4
--- a/common/autoconf/jdk-options.m4	Thu May 28 16:46:12 2015 -0700
+++ b/common/autoconf/jdk-options.m4	Wed Jun 03 10:50:09 2015 +0200
@@ -531,6 +531,12 @@
   fi
   AC_SUBST(JDK_VERSION)
 
+  # The cooked update version used to encode trailing letters in the update
+  # version into a trailing number. That is no longer needed, but need to
+  # keep the format in 8u for compatibility.
+  COOKED_JDK_UPDATE_VERSION="${JDK_UPDATE_VERSION}0"
+  AC_SUBST(COOKED_JDK_UPDATE_VERSION)
+
   COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'`
   AC_SUBST(COOKED_BUILD_NUMBER)
 ])