diff --git a/THIRD_PARTY_README b/THIRD_PARTY_README
index ba48858c28f31ec980ac048e17aa9905206d3b91..a93b35b994ce5f2923010677f571507ae856e5d8 100644
--- a/THIRD_PARTY_README
+++ b/THIRD_PARTY_README
@@ -1400,7 +1400,7 @@ THE SOFTWARE.
 -------------------------------------------------------------------------------
 
 %% This notice is provided with respect to Little CMS 2.4, which may be 
-included with OpenJDK 8.
+included with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
 
diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in
index e8649ddbee55aa460dc98166eeae0d6100645b39..2f577374fb92be5d3bd7691c772839c9af628743 100644
--- a/common/autoconf/spec.gmk.in
+++ b/common/autoconf/spec.gmk.in
@@ -170,7 +170,7 @@ RUNTIME_NAME=$(PRODUCT_NAME) $(PRODUCT_SUFFIX)
 COOKED_BUILD_NUMBER:=@COOKED_BUILD_NUMBER@
 # These variables need to be generated here so that MILESTONE and
 # JDK_BUILD_NUMBER can be overridden on the make command line.
-ifeq ($(MILESTONE),)
+ifeq ($(MILESTONE), fcs)
   RELEASE=$(JDK_VERSION)$(BUILD_VARIANT_RELEASE)
 else
   RELEASE=$(JDK_VERSION)-$(MILESTONE)$(BUILD_VARIANT_RELEASE)