diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
index 694623e1e95089b7bf8cd5b0ca94a609476604c9..3bc6c12118b0c276e95de8e3e8f051316d32ec6e 100644
--- a/common/autoconf/generated-configure.sh
+++ b/common/autoconf/generated-configure.sh
@@ -3723,7 +3723,7 @@ fi
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1358937404
+DATE_WHEN_GENERATED=1358937713
 
 ###############################################################################
 #
@@ -10778,7 +10778,8 @@ if test "x$with_milestone" = xyes; then
   as_fn_error $? "Milestone must have a value" "$LINENO" 5
 elif test "x$with_milestone" != x; then
     MILESTONE="$with_milestone"
-else
+fi
+if test "x$MILESTONE" = x; then
   MILESTONE=internal
 fi
 
diff --git a/common/autoconf/jdk-options.m4 b/common/autoconf/jdk-options.m4
index d9f188d65d862aa81f07af51c9638d2739a1db45..48eb3f85c0e9bd400b1080037323df68e9ab8486 100644
--- a/common/autoconf/jdk-options.m4
+++ b/common/autoconf/jdk-options.m4
@@ -389,7 +389,8 @@ if test "x$with_milestone" = xyes; then
   AC_MSG_ERROR([Milestone must have a value])
 elif test "x$with_milestone" != x; then
     MILESTONE="$with_milestone"
-else
+fi
+if test "x$MILESTONE" = x; then
   MILESTONE=internal
 fi