diff -r fb18048d7ee3 -r b8b34f35e2ee jdk/make/CompileDemos.gmk
--- a/jdk/make/CompileDemos.gmk	Thu Nov 05 08:15:41 2015 -0800
+++ b/jdk/make/CompileDemos.gmk	Mon Nov 09 10:57:01 2015 -0800
@@ -55,7 +55,8 @@
   SOURCE_FILES := $(JDK_TOPDIR)/make/data/mainmanifest/manifest.mf, \
   OUTPUT_FILE := $(SUPPORT_OUTPUTDIR)/demo/java-main-manifest.mf, \
   REPLACEMENTS := \
-      @@RELEASE@@ => $(RELEASE) ; \
+      @@VERSION_SPECIFICATION@@ => $(VERSION_SPECIFICATION) ; \
+      @@VERSION_SHORT@@ => $(VERSION_SHORT) ; \
       @@COMPANY_NAME@@ => $(COMPANY_NAME) , \
 ))