--- old/make/common/Release.gmk	Tue Nov 30 17:29:14 2010
+++ new/make/common/Release.gmk	Tue Nov 30 17:29:14 2010
@@ -26,6 +26,9 @@
 include $(JDK_TOPDIR)/make/docs/CORE_PKGS.gmk
 include $(JDK_TOPDIR)/make/docs/NON_CORE_PKGS.gmk
 
+# What jdk version are we building
+THIS_JDK_VERSION := $(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION)
+
 #
 # Perform release engineering tasks.
 #
@@ -72,9 +75,6 @@
 
 JTG_DOCS            = $(JDK_TOPDIR)/src/solaris/doc
 
-#We use this for man page header
-jdkversion := $(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION)
-
 # Text documents on windows use this suffix
 ifeq ($(PLATFORM), windows)
   TEXT_SUFFIX = .txt
@@ -214,7 +214,7 @@
         $(MKDIR) -p $1/man/$${ja_dir}/man1; \
         $(CAT) $${manbase}/ja/$${manpage} \
           | $(NATIVE2ASCII) -encoding $(JA_SOURCE_ENCODING) \
-          | $(SED) 's/@@VERSION@@/$(jdkversion)/g' \
+          | $(SED) 's/@@VERSION@@/$(THIS_JDK_VERSION)/g' \
           | $(NATIVE2ASCII) -reverse -encoding $${ja_encoding} \
             > $1/man/$${ja_dir}/man1/$${manpage}; \
       done; \
@@ -500,6 +500,30 @@
 # Attach library is JDK only
 NOTJRE_SHARED_LIBS += $(LIB_PREFIX)attach.$(LIBRARY_SUFFIX)
 
+###############
+# The jdk text info file that lives at the root of the jdk installation.
+
+JDK_INFO_FILE = $(JDK_IMAGE_DIR)/jdk.release
+
+# Common way to emit a line into $(JDK_INFO_FILE)
+define jdk-info-file # name value
+$(PRINTF) "jdk.%s = %s\n" $1 $2 >> $@
+endef
+
+# Values to emit
+MINIMUM_OS_NAME    := $(REQUIRED_OS_NAME)
+MINIMUM_OS_VERSION := $(REQUIRED_OS_VERSION)
+MINIMUM_OS_ARCH    := $(ARCH)
+ALL_VM_CFG_FILES   := $(patsubst $(JDK_IMAGE_DIR)/%,%,$(wildcard $(JDK_IMAGE_DIR)/jre/lib/*/jvm.cfg))
+
+$(JDK_INFO_FILE): FRC
+	$(prep-target)
+	$(call jdk-info-file, "version",      "$(THIS_JDK_VERSION)")
+	$(call jdk-info-file, "os.name",      "$(MINIMUM_OS_NAME)")
+	$(call jdk-info-file, "os.version",   "$(MINIMUM_OS_VERSION)")
+	$(call jdk-info-file, "os.arch",      "$(MINIMUM_OS_ARCH)")
+	$(call jdk-info-file, "vm.cfg.files", "$(ALL_VM_CFG_FILES)")
+
 #
 ###### RULES
 
@@ -940,6 +964,7 @@
 # Standard jdk image
 initial-image-jdk:: initial-image-jdk-setup \
 		    initial-image-jdk-db \
+		    $(JDK_INFO_FILE) \
 		    $(JDK_LICENSES) $(JDK_DOCFILES)
 	$(MKDIR) $(JDK_IMAGE_DIR)/lib
 	@#