diff --git a/make/common/Release.gmk b/make/common/Release.gmk
index d9872bcc71c3eeaa5dc6861a4a01dd6b495743ea..a64bdacfedc7ef28f75b49bc6358bf5c237e150c 100644
--- a/make/common/Release.gmk
+++ b/make/common/Release.gmk
@@ -62,7 +62,8 @@ EXCLUDE_PROPWARN_PKGS += sun.dyn
 # This is an interim solution until the ct.sym is replaced
 # with a new module system (being discussed for JDK 7).
 #
-EXPORTED_PRIVATE_PKGS = com.sun.servicetag
+EXPORTED_PRIVATE_PKGS = com.sun.servicetag \
+                        com.oracle.net
 
 # 64-bit solaris has a few special cases. We define the variable
 # SOLARIS64 for use in this Makefile to easily test those cases
@@ -86,8 +87,14 @@ ifdef OPENJDK
   IMAGE_DOCLIST_JRE = LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
 else
   # Where to find these files
-  SHARE_JDK_DOC_SRC = $(CLOSED_SHARE_SRC)/doc/jdk
-  SHARE_JRE_DOC_SRC = $(CLOSED_SHARE_SRC)/doc/jre
+  ifeq ($(J4B), true)
+      SHARE_JDK_DOC_SRC = $(CLOSED_SHARE_SRC)/doc/jdkfb
+      SHARE_JRE_DOC_SRC = $(CLOSED_SHARE_SRC)/doc/jrefb
+  else
+      SHARE_JDK_DOC_SRC = $(CLOSED_SHARE_SRC)/doc/jdk
+      SHARE_JRE_DOC_SRC = $(CLOSED_SHARE_SRC)/doc/jre
+  endif
+
   IMAGE_DOCLIST_JDK = COPYRIGHT README.html  THIRDPARTYLICENSEREADME.txt
   IMAGE_DOCLIST_JRE = COPYRIGHT Welcome.html THIRDPARTYLICENSEREADME.txt
   ifeq ($(PLATFORM), windows)
diff --git a/make/common/shared/Defs.gmk b/make/common/shared/Defs.gmk
index 587f1ad19118fa49fc00b9ea55f3e69ee9fc2e27..cfc889a01484b12c9e7f75cce4ec06499601ff11 100644
--- a/make/common/shared/Defs.gmk
+++ b/make/common/shared/Defs.gmk
@@ -218,7 +218,11 @@ ifdef OPENJDK
 else
   LAUNCHER_NAME = java
   PRODUCT_NAME = Java(TM)
-  PRODUCT_SUFFIX = SE Runtime Environment
+  ifeq ($(J4B), true)
+    PRODUCT_SUFFIX = SE Runtime Environment for Business
+  else
+    PRODUCT_SUFFIX = SE Runtime Environment
+  endif
   JDK_RC_PLATFORM_NAME = Platform SE
   COMPANY_NAME = Oracle Corporation
 endif