diff --git a/jdk/make/sun/cmm/Makefile b/jdk/make/sun/cmm/Makefile
index 66513e5f64b..6aae4d1e326 100644
--- a/jdk/make/sun/cmm/Makefile
+++ b/jdk/make/sun/cmm/Makefile
@@ -41,12 +41,8 @@ endif # OPENJDK
 ICCPROFILE_DEST_DIR = $(LIBDIR)/cmm
 
 iccprofiles: $(ICCPROFILE_DEST_DIR)/sRGB.pf $(ICCPROFILE_DEST_DIR)/GRAY.pf \
-	     $(ICCPROFILE_DEST_DIR)/CIEXYZ.pf
-
-ifndef OPENJDK
-iccprofiles:  $(ICCPROFILE_DEST_DIR)/PYCC.pf \
-	      $(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf
-endif
+	     $(ICCPROFILE_DEST_DIR)/CIEXYZ.pf $(ICCPROFILE_DEST_DIR)/PYCC.pf \
+	     $(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf
 
 $(ICCPROFILE_DEST_DIR)/sRGB.pf: $(ICCPROFILE_SRC_DIR)/sRGB.pf
 	$(RM) $(ICCPROFILE_DEST_DIR)/sRGB.pf
diff --git a/jdk/src/share/lib/cmm/lcms/GRAY.pf b/jdk/src/share/lib/cmm/lcms/GRAY.pf
index 3686df40d24..8af309cc0a2 100644
Binary files a/jdk/src/share/lib/cmm/lcms/GRAY.pf and b/jdk/src/share/lib/cmm/lcms/GRAY.pf differ
diff --git a/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf b/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf
new file mode 100644
index 00000000000..3e0b1777a8c
Binary files /dev/null and b/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf differ
diff --git a/jdk/src/share/lib/cmm/lcms/PYCC.pf b/jdk/src/share/lib/cmm/lcms/PYCC.pf
new file mode 100644
index 00000000000..0cee0158949
Binary files /dev/null and b/jdk/src/share/lib/cmm/lcms/PYCC.pf differ
diff --git a/jdk/test/sun/java2d/cmm/ProfileOp/ReadProfileTest.java b/jdk/test/sun/java2d/cmm/ProfileOp/ReadProfileTest.java
index 42002f96b45..1a4570f9c6d 100644
--- a/jdk/test/sun/java2d/cmm/ProfileOp/ReadProfileTest.java
+++ b/jdk/test/sun/java2d/cmm/ProfileOp/ReadProfileTest.java
@@ -23,7 +23,7 @@
 
 /**
  * @test
- * @bug 6476665
+ * @bug 6476665 6523403
  * @summary Verifies reading profiles of the standard color spaces
  * @run main ReadProfileTest
  */