diff --git a/docs/CMake API.md b/docs/CMake API.md
index 7e1ec9b2c4..985085564b 100644
--- a/docs/CMake API.md	
+++ b/docs/CMake API.md	
@@ -512,7 +512,7 @@ attributes directly to these creation functions, rather than adding them later.
     in GarageBand.
 
 - `AAX_CATEGORY`
-  - Should be one of: `AAX_ePlugInCategory_None`, `AAX_ePlugInCategory_EQ`,
+  - Should be one or more of: `AAX_ePlugInCategory_None`, `AAX_ePlugInCategory_EQ`,
     `AAX_ePlugInCategory_Dynamics`, `AAX_ePlugInCategory_PitchShift`, `AAX_ePlugInCategory_Reverb`,
     `AAX_ePlugInCategory_Delay`, `AAX_ePlugInCategory_Modulation`, `AAX_ePlugInCategory_Harmonic`,
     `AAX_ePlugInCategory_NoiseReduction`, `AAX_ePlugInCategory_Dither`,
diff --git a/extras/Build/CMake/JUCEUtils.cmake b/extras/Build/CMake/JUCEUtils.cmake
index 9b595b69af..7e705cb81a 100644
--- a/extras/Build/CMake/JUCEUtils.cmake
+++ b/extras/Build/CMake/JUCEUtils.cmake
@@ -1805,23 +1805,9 @@ function(_juce_set_fallback_properties target)
     endif()
 
     # AAX category
-    set(aax_category_ints
-        0x00000000
-        0x00000001
-        0x00000002
-        0x00000004
-        0x00000008
-        0x00000010
-        0x00000020
-        0x00000040
-        0x00000080
-        0x00000100
-        0x00000200
-        0x00000400
-        0x00000800
-        0x00001000
-        0x00002000)
 
+    # The order of these strings is important, as the index of each string
+    # will be used to set an appropriate bit in the category bitfield.
     set(aax_category_strings
         ePlugInCategory_None
         ePlugInCategory_EQ
@@ -1849,11 +1835,29 @@ function(_juce_set_fallback_properties target)
 
     # Replace AAX category string with its integral representation
     get_target_property(actual_aax_category ${target} JUCE_AAX_CATEGORY)
-    list(FIND aax_category_strings ${actual_aax_category} aax_index)
 
-    if(aax_index GREATER_EQUAL 0)
-        list(GET aax_category_ints ${aax_index} aax_int_representation)
-        set_target_properties(${target} PROPERTIES JUCE_AAX_CATEGORY ${aax_int_representation})
+    set(aax_category_int "")
+
+    foreach(category_string IN LISTS actual_aax_category)
+        list(FIND aax_category_strings ${category_string} aax_index)
+
+        if(aax_index GREATER_EQUAL 0)
+            if(aax_index EQUAL 0)
+                set(aax_category_bit 0)
+            else()
+                set(aax_category_bit "1 << (${aax_index} - 1)")
+            endif()
+
+            if(aax_category_int STREQUAL "")
+                set(aax_category_int 0)
+            endif()
+
+            math(EXPR aax_category_int "${aax_category_int} | (${aax_category_bit})")
+        endif()
+    endforeach()
+
+    if(NOT aax_category_int STREQUAL "")
+        set_target_properties(${target} PROPERTIES JUCE_AAX_CATEGORY ${aax_category_int})
     endif()
 endfunction()
 
@@ -1917,7 +1921,6 @@ function(_juce_initialise_target target)
         AU_EXPORT_PREFIX
         AU_SANDBOX_SAFE
         SUPPRESS_AU_PLIST_RESOURCE_USAGE
-        AAX_CATEGORY
         PLUGINHOST_AU                   # Set this true if you want to host AU plugins
         USE_LEGACY_COMPATIBILITY_PLUGIN_CODE
 
@@ -1934,6 +1937,7 @@ function(_juce_initialise_target target)
         HARDENED_RUNTIME_OPTIONS
         APP_SANDBOX_OPTIONS
         DOCUMENT_EXTENSIONS
+        AAX_CATEGORY
         IPHONE_SCREEN_ORIENTATIONS      # iOS only
         IPAD_SCREEN_ORIENTATIONS        # iOS only
         APP_GROUP_IDS)                  # iOS only