diff --git a/extras/Build/juce_build_tools/utils/juce_Entitlements.cpp b/extras/Build/juce_build_tools/utils/juce_Entitlements.cpp
index c41b4db0b2..2a4d6ac815 100644
--- a/extras/Build/juce_build_tools/utils/juce_Entitlements.cpp
+++ b/extras/Build/juce_build_tools/utils/juce_Entitlements.cpp
@@ -51,24 +51,23 @@ namespace build_tools
         {
             if ((isAudioPluginProject && shouldEnableIAA) || isAUPluginHost)
                 entitlements.set ("inter-app-audio", "<true/>");
+        }
+        if (isiCloudPermissionsEnabled)
+        {
+            entitlements.set ("com.apple.developer.icloud-container-identifiers",
+                              "<array>\n"
+                              "        <string>iCloud.$(CFBundleIdentifier)</string>\n"
+                              "    </array>");
 
-            if (isiCloudPermissionsEnabled)
-            {
-                entitlements.set ("com.apple.developer.icloud-container-identifiers",
-                                  "<array>\n"
-                                  "        <string>iCloud.$(CFBundleIdentifier)</string>\n"
-                                  "    </array>");
+            entitlements.set ("com.apple.developer.icloud-services",
+                              "<array>\n"
+                              "        <string>CloudDocuments</string>\n"
+                              "    </array>");
 
-                entitlements.set ("com.apple.developer.icloud-services",
-                                  "<array>\n"
-                                  "        <string>CloudDocuments</string>\n"
-                                  "    </array>");
-
-                entitlements.set ("com.apple.developer.ubiquity-container-identifiers",
-                                  "<array>\n"
-                                  "        <string>iCloud.$(CFBundleIdentifier)</string>\n"
-                                  "    </array>");
-            }
+            entitlements.set ("com.apple.developer.ubiquity-container-identifiers",
+                              "<array>\n"
+                              "        <string>iCloud.$(CFBundleIdentifier)</string>\n"
+                              "    </array>");
         }
 
         if (isPushNotificationsEnabled)
diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h
index 892babbdd4..8c86b1f21b 100644
--- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h
+++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h
@@ -612,12 +612,13 @@ public:
 
             props.add (new ChoicePropertyComponent (iosAppGroupsValue, "App Groups Capability"),
                        "Enable this to grant your app the capability to share resources between apps using the same app group ID.");
-
-            props.add (new ChoicePropertyComponent (iCloudPermissionsValue, "iCloud Permissions"),
-                       "Enable this to grant your app the capability to use native file load/save browser windows on iOS.");
-
         }
 
+
+        props.add (new ChoicePropertyComponent (iCloudPermissionsValue, "iCloud Permissions"),
+                  iOS ? "Enable this to grant your app the capability to use native file load/save browser windows on iOS." :
+                  "Enable this to grant your app the capability to use iCloud Document Storage");
+
         props.add (new ChoicePropertyComponent (networkingMulticastValue, "Networking Multicast Capability"),
                    "Your app must have this entitlement to send or receive IP multicast or broadcast. "
                    "You will also need permission from Apple to use this entitlement.");
@@ -1323,7 +1324,7 @@ public:
             capabilities["Sandbox"]               = type == Target::AudioUnitv3PlugIn || owner.isAppSandboxEnabled();
             capabilities["HardenedRuntime"]       = owner.isHardenedRuntimeEnabled();
 
-            if (owner.iOS && owner.isiCloudPermissionsEnabled())
+            if (owner.isiCloudPermissionsEnabled())
                 capabilities["com.apple.iCloud"] = true;
 
             StringArray capabilitiesStrings;