--- a/jdk/make/CompileDemos.gmk	Thu Nov 12 10:39:06 2015 -0800
+++ b/jdk/make/CompileDemos.gmk	Mon Nov 16 17:10:20 2015 -0800
@@ -58,7 +58,8 @@
   SOURCE_FILES := $(JDK_TOPDIR)/make/data/mainmanifest/manifest.mf, \
   OUTPUT_FILE := $(DEMO_MANIFEST), \
   REPLACEMENTS := \
-      @@RELEASE@@ => $(RELEASE) ; \
+      @@VERSION_SPECIFICATION@@ => $(VERSION_SPECIFICATION) ; \
+      @@VERSION_SHORT@@ => $(VERSION_SHORT) ; \
       @@COMPANY_NAME@@ => $(COMPANY_NAME) , \
 ))