--- old/common/autoconf/jdk-version.m4	2015-06-25 16:00:18.478664909 +0200
+++ new/common/autoconf/jdk-version.m4	2015-06-25 16:00:18.398661517 +0200
@@ -312,6 +312,13 @@
   fi
   VERSION_PRE=$VERSION_PRE_BASE${VERSION_PRE_DEBUGLEVEL:+.$VERSION_PRE_DEBUGLEVEL}
 
+  # Set VERSION_IS_GA based on if VERSION_PRE has a value
+  if test "x$VERSION_PRE" = x; then
+    VERSION_IS_GA=true
+  else
+    VERSION_IS_GA=false
+  fi
+
   # VERSION_NUMBER but always with exactly 4 positions, with 0 for empty positions.
   VERSION_NUMBER_FOUR_POSITIONS=$VERSION_MAJOR.$VERSION_MINOR.$VERSION_SECURITY.$VERSION_PATCH
 
@@ -345,4 +352,5 @@
   AC_SUBST(VERSION_NUMBER_FOUR_POSITIONS)
   AC_SUBST(VERSION_STRING)
   AC_SUBST(VERSION_SHORT)
+  AC_SUBST(VERSION_IS_GA)
 ])
--- old/common/autoconf/spec.gmk.in	2015-06-25 16:00:18.838680177 +0200
+++ new/common/autoconf/spec.gmk.in	2015-06-25 16:00:18.750676446 +0200
@@ -175,6 +175,9 @@
 VERSION_SHORT := @VERSION_SHORT@
 # The Java specification version. It should be equal to version number.
 VERSION_SPECIFICATION := @VERSION_NUMBER@
+# A GA version is defined by the PRE string being empty. Rather than testing for
+# that, this variable defines it with true/false.
+VERSION_IS_GA := @VERSION_IS_GA@
 
 # Convenience CFLAGS settings for passing version information into native programs.
 VERSION_CFLAGS := \
--- old/make/Javadoc.gmk	2015-06-25 16:00:19.218696293 +0200
+++ new/make/Javadoc.gmk	2015-06-25 16:00:19.130692561 +0200
@@ -308,8 +308,8 @@
 
 
 
-# Assume we need a draft format whenever the pre-release identifier is non-empty
-ifneq ($(VERSION_PRE),)
+# Assume we need a draft format when the version string is not a GA version.
+ifeq ($(VERSION_IS_GA), false)
   DRAFT_HEADER := <br><strong>DRAFT&nbsp;$(VERSION_STRING)</strong>
   DRAFT_BOTTOM := <br><strong>DRAFT&nbsp;$(VERSION_STRING)</strong>
   DRAFT_WINTITLE := $(VERSION_BUILD)