diff --git a/gimp-data b/gimp-data
index 383a5cda3f6b68c0e49004baa0b28fb4d9fefa82..7e0f9291721a97bf10ed94564e8c6bf5be6531ba 160000
--- a/gimp-data
+++ b/gimp-data
@@ -1 +1 @@
-Subproject commit 383a5cda3f6b68c0e49004baa0b28fb4d9fefa82
+Subproject commit 7e0f9291721a97bf10ed94564e8c6bf5be6531ba
diff --git a/plug-ins/file-icns/file-icns-export.c b/plug-ins/file-icns/file-icns-export.c
index 1f654cdd0d88463711708e5c3d8ae5a06cf2004f..e61587c75500d1e54e37f9226ccdf43e8d6bb398 100644
--- a/plug-ins/file-icns/file-icns-export.c
+++ b/plug-ins/file-icns/file-icns-export.c
@@ -480,17 +480,20 @@ icns_export_image (GFile        *file,
 
           procedure   = gimp_pdb_lookup_procedure (gimp_get_pdb (), "file-png-export");
           return_vals = gimp_procedure_run (procedure,
-                                            "run-mode",         GIMP_RUN_NONINTERACTIVE,
-                                            "image",            temp_image,
-                                            "file",             temp_file,
-                                            "interlaced",       FALSE,
-                                            "compression",      9,
-                                            "bkgd",             FALSE,
-                                            "offs",             FALSE,
-                                            "phys",             FALSE,
-                                            "time",             FALSE,
-                                            "save-transparent", FALSE,
-                                            "optimize-palette", FALSE,
+                                            "run-mode",           GIMP_RUN_NONINTERACTIVE,
+                                            "image",              temp_image,
+                                            "file",               temp_file,
+                                            "interlaced",         FALSE,
+                                            "compression",        9,
+                                            "bkgd",               FALSE,
+                                            "offs",               FALSE,
+                                            "phys",               FALSE,
+                                            "time",               FALSE,
+                                            "save-transparent",   FALSE,
+                                            "optimize-palette",   FALSE,
+#if defined(PNG_iCCP_SUPPORTED)
+                                            "save-color-profile", TRUE,
+#endif
                                             NULL);
           gimp_image_delete (temp_image);
 
diff --git a/tools/in-build-gimp.sh b/tools/in-build-gimp.sh
index 913fd19c80f05aa0c640b2ffcfde25b014043c20..c61694f3dba0d4e110f7d0b1fc01534456720ab9 100755
--- a/tools/in-build-gimp.sh
+++ b/tools/in-build-gimp.sh
@@ -10,17 +10,16 @@ if [ -n "$GIMP_TEMP_UPDATE_RPATH" ]; then
   # it didn't work on contributor's builds because of System Integrity
   # Protection (SIP), though it did work in the CI.
   export IFS=":"
-  for bin in $GIMP_TEMP_UPDATE_RPATH;
-  do
-    install_name_tool -add_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimp $bin
-    install_name_tool -add_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpbase $bin
-    install_name_tool -add_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpcolor $bin
-    install_name_tool -add_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpconfig $bin
-    install_name_tool -add_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpmath $bin
-    install_name_tool -add_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpmodule $bin
-    install_name_tool -add_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpthumb $bin
-    install_name_tool -add_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpwidgets $bin
-  done;
+  for bin in $GIMP_TEMP_UPDATE_RPATH; do
+    install_name_tool -add_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimp $bin || true
+    install_name_tool -add_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpbase $bin || true
+    install_name_tool -add_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpcolor $bin || true
+    install_name_tool -add_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpconfig $bin || true
+    install_name_tool -add_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpmath $bin || true
+    install_name_tool -add_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpmodule $bin || true
+    install_name_tool -add_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpthumb $bin || true
+    install_name_tool -add_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpwidgets $bin || true
+  done
   unset IFS
 fi
 
@@ -34,8 +33,7 @@ fi
 
 if [ -n "$GIMP_TEMP_UPDATE_RPATH" ]; then
   export IFS=":"
-  for bin in $GIMP_TEMP_UPDATE_RPATH;
-  do
+  for bin in $GIMP_TEMP_UPDATE_RPATH; do
     install_name_tool -delete_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimp $bin
     install_name_tool -delete_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpbase $bin
     install_name_tool -delete_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpcolor $bin
@@ -44,7 +42,7 @@ if [ -n "$GIMP_TEMP_UPDATE_RPATH" ]; then
     install_name_tool -delete_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpmodule $bin
     install_name_tool -delete_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpthumb $bin
     install_name_tool -delete_rpath ${GIMP_GLOBAL_BUILD_ROOT}/libgimpwidgets $bin
-  done;
+  done
   unset IFS
 fi