--- old/common/autoconf/jdk-options.m4	2012-12-30 14:45:51.814994675 +0100
+++ new/common/autoconf/jdk-options.m4	2012-12-30 14:45:51.714977384 +0100
@@ -399,10 +399,22 @@
 
 if test "x$JDK_UPDATE_VERSION" != x; then
     JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}"
+    MARKETING_NUMBER=`$ECHO ${JDK_UPDATE_VERSION} \
+                      | $NAWK '{if (substr($[0],1,1)=="0") print substr($[0], 2); else print $[0];}'`
+    MARKET_NAME=" Update ${MARKETING_NUMBER}"
+    JDK_MKTG_VERSION=${JDK_MINOR_VERSION}u${MARKETING_NUMBER}
 else
     JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}"
+    JDK_MKTG_VERSION=${JDK_MINOR_VERSION}
+    MARKET_NAME=
 fi
+JDK_UNDERSCORE_VERSION=`$ECHO ${JDK_VERSION} | $SED 's/\./_/g'`
+JDK_MKTG_UNDERSCORE_VERSION=`$ECHO ${JDK_MKTG_VERSION} | $SED 's/\./_/g'`
+
 AC_SUBST(JDK_VERSION)
+AC_SUBST(JDK_MKTG_VERSION)
+AC_SUBST(JDK_UNDERSCORE_VERSION)
+AC_SUBST(JDK_MKTG_UNDERSCORE_VERSION)
 
 if test "x$MILESTONE" != x; then
     RELEASE="${JDK_VERSION}-${MILESTONE}${BUILD_VARIANT_RELEASE}"
@@ -424,6 +436,9 @@
 AC_SUBST(FULL_VERSION)
 COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'`
 AC_SUBST(COOKED_BUILD_NUMBER)
+
+BUNDLE_DATE=`$DATE '+%d_%b_%Y' | $TR "[A-Z]" "[a-z]"`
+AC_SUBST(BUNDLE_DATE)
 ])
 
 AC_DEFUN_ONCE([JDKOPT_SETUP_BUILD_TWEAKS],