diff --git a/.gitmodules b/.gitmodules
index 474b7ad5485..44480bd897a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -35,3 +35,6 @@
 [submodule "libs/sst/sst-cpputils"]
 	path = libs/sst/sst-cpputils
 	url = https://github.com/surge-synthesizer/sst-cpputils
+[submodule "libs/clap-juce-extensions"]
+	path = libs/clap-juce-extensions
+	url = https://github.com/free-audio/clap-juce-extensions
diff --git a/libs/clap-juce-extensions b/libs/clap-juce-extensions
new file mode 160000
index 00000000000..66ed912021c
--- /dev/null
+++ b/libs/clap-juce-extensions
@@ -0,0 +1 @@
+Subproject commit 66ed912021c1820911329d5aaa0392eaec87ee68
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bc36a2d2f4e..dde923ad6fa 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,6 +13,7 @@ include(cmake/lib.cmake)
 
 message(STATUS "Using JUCE from ${SURGE_JUCE_PATH}")
 add_subdirectory(${SURGE_JUCE_PATH} ${CMAKE_BINARY_DIR}/JUCE EXCLUDE_FROM_ALL)
+add_subdirectory(../libs/clap-juce-extensions clap-extensions EXCLUDE_FROM_ALL)
 
 add_library(simde INTERFACE)
 target_include_directories(simde INTERFACE ${CMAKE_SOURCE_DIR}/libs/simde)
@@ -46,10 +47,6 @@ target_compile_definitions(surge-juce INTERFACE
 
 set(SURGE_JUCE_FORMATS VST3)
 
-if (CLAP_JUCE_EXTENSIONS_ROOT)
-  add_subdirectory(${CLAP_JUCE_EXTENSIONS_ROOT} clap-extensions)
-endif()
-
 if(NOT SURGE_SKIP_STANDALONE)
   list(APPEND SURGE_JUCE_FORMATS Standalone)
 endif()
diff --git a/src/cmake/lib.cmake b/src/cmake/lib.cmake
index 0e0cbda8c87..41a58a070af 100644
--- a/src/cmake/lib.cmake
+++ b/src/cmake/lib.cmake
@@ -86,9 +86,19 @@ function(surge_make_installers)
 
   if(APPLE)
     run_installer_script(installer_mac/make_installer.sh)
+    add_custom_command(TARGET surge-xt-distribution
+      POST_BUILD
+      WORKING_DIRECTORY ${SURGE_PRODUCT_DIR}
+      COMMAND zip -r ${SURGE_XT_DIST_OUTPUT_DIR}/surge-xt-macos-${SXTVER}-pluginsonly.zip .
+      )
   elseif(UNIX)
     run_installer_script(installer_linux/make_deb.sh)
     run_installer_script(installer_linux/make_rpm.sh)
+    add_custom_command(TARGET surge-xt-distribution
+      POST_BUILD
+      WORKING_DIRECTORY ${SURGE_PRODUCT_DIR}
+      COMMAND tar cvzf ${SURGE_XT_DIST_OUTPUT_DIR}/surge-xt-linux-${SXTVER}-pluginsonly.tgz .
+      )
   elseif(WIN32)
     add_custom_command(TARGET surge-xt-distribution
       POST_BUILD
diff --git a/src/surge-fx/CMakeLists.txt b/src/surge-fx/CMakeLists.txt
index 1370917cb2a..e75aeb39d50 100644
--- a/src/surge-fx/CMakeLists.txt
+++ b/src/surge-fx/CMakeLists.txt
@@ -62,9 +62,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
   juce::juce_audio_processors
 )
 
-if (CLAP_JUCE_EXTENSIONS_ROOT)
-  clap_juce_extensions_plugin(TARGET surge-fx
-          CLAP_ID "org.surge-synth-team.surge-xt-fx")
-endif()
+clap_juce_extensions_plugin(TARGET surge-fx
+        CLAP_ID "org.surge-synth-team.surge-xt-fx")
 
 surge_juce_package(${PROJECT_NAME} "Surge XT Effects")
diff --git a/src/surge-xt/CMakeLists.txt b/src/surge-xt/CMakeLists.txt
index 64abc32e98c..232595c3e7b 100644
--- a/src/surge-xt/CMakeLists.txt
+++ b/src/surge-xt/CMakeLists.txt
@@ -50,11 +50,9 @@ juce_add_plugin(${PROJECT_NAME}
   FORMATS ${SURGE_JUCE_FORMATS}
   )
 
-if (CLAP_JUCE_EXTENSIONS_ROOT)
-  clap_juce_extensions_plugin(TARGET surge-xt
-          CLAP_ID "org.surge-synth-team.surge-xt")
-  target_sources(${PROJECT_NAME}_CLAP PRIVATE plugin_type_extensions/SurgeSynthClapExtensions.cpp)
-endif()
+clap_juce_extensions_plugin(TARGET surge-xt
+        CLAP_ID "org.surge-synth-team.surge-xt")
+target_sources(${PROJECT_NAME}_CLAP PRIVATE plugin_type_extensions/SurgeSynthClapExtensions.cpp)
 
 if(JUCE_ASIO_SUPPORT)
   target_compile_definitions(${PROJECT_NAME} PUBLIC JUCE_ASIO=1)