diff --git a/common/autoconf/jdk-version.m4 b/common/autoconf/jdk-version.m4
index d3d9fc1a835..8c634571f9b 100644
--- a/common/autoconf/jdk-version.m4
+++ b/common/autoconf/jdk-version.m4
@@ -309,6 +309,13 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
   # "opt-base_debug-level" otherwise.
   VERSION_OPT=$VERSION_OPT_BASE${VERSION_OPT_DEBUGLEVEL:+_$VERSION_OPT_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
 
@@ -342,4 +349,5 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
   AC_SUBST(VERSION_NUMBER_FOUR_POSITIONS)
   AC_SUBST(VERSION_STRING)
   AC_SUBST(VERSION_SHORT)
+  AC_SUBST(VERSION_IS_GA)
 ])
diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in
index b52db2bdde4..50439741972 100644
--- a/common/autoconf/spec.gmk.in
+++ b/common/autoconf/spec.gmk.in
@@ -175,6 +175,9 @@ VERSION_STRING := @VERSION_STRING@
 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 := \
diff --git a/make/Javadoc.gmk b/make/Javadoc.gmk
index 108aefcd187..c4e993cf8ec 100644
--- a/make/Javadoc.gmk
+++ b/make/Javadoc.gmk
@@ -308,8 +308,8 @@ endef
 
 
 
-# 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)