diff -r 372a73eb2eb0 -r 7e7d0a4c718b make/JrtfsJar.gmk
--- a/make/JrtfsJar.gmk	Thu Nov 12 10:38:57 2015 -0800
+++ b/make/JrtfsJar.gmk	Mon Nov 16 21:19:13 2015 -0800
@@ -35,7 +35,8 @@
   SOURCE_FILES := $(JDK_TOPDIR)/make/data/mainmanifest/manifest.mf, \
   OUTPUT_FILE := $(SUPPORT_OUTPUTDIR)/java-main-manifest.mf, \
   REPLACEMENTS := \
-      @@RELEASE@@ => $(RELEASE) ; \
+      @@VERSION_SPECIFICATION@@ => $(VERSION_SPECIFICATION) ; \
+      @@VERSION_SHORT@@ => $(VERSION_SHORT) ; \
       @@COMPANY_NAME@@ => $(COMPANY_NAME) , \
 ))