diff --git a/CMakeLists.txt b/CMakeLists.txt
index de16852e..f4f21b8b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,8 +66,11 @@ option(SCXT_USE_FLAC "Include FLAC support" ON)
 option(SCXT_USE_MP3 "Include MP3 support" ON)
 
 option(SCXT_SANITIZE "Build with clang/gcc address and undef sanitizer" OFF)
-option(SCXT_USE_CLAP_WRAPPER_STANDALONE "Build with the clap wrapper standalone rather than our temp one" OFF)
-
+if (WIN32)
+    option(SCXT_USE_CLAP_WRAPPER_STANDALONE "Build with the clap wrapper standalone rather than our temp one" ON)
+else()
+    option(SCXT_USE_CLAP_WRAPPER_STANDALONE "Build with the clap wrapper standalone rather than our temp one" OFF)
+endif()
 
 # Calculate bitness
 math(EXPR BITS "8*${CMAKE_SIZEOF_VOID_P}")
diff --git a/clients/clap-first/CMakeLists.txt b/clients/clap-first/CMakeLists.txt
index 9a58e9a0..a363c63b 100644
--- a/clients/clap-first/CMakeLists.txt
+++ b/clients/clap-first/CMakeLists.txt
@@ -74,7 +74,7 @@ endif()
 set(SA_TARGET ${PROJECT_NAME}_Standalone)
 
 if (${SCXT_USE_CLAP_WRAPPER_STANDALONE})
-    message(STATUS "Standalone is CLap Wrapper")
+    message(STATUS "Standalone is provided by clap-wrapper")
     add_executable(${SA_TARGET} scxt-clap-entry.cpp)
     target_link_libraries(${SA_TARGET} PRIVATE ${IMPL_TARGET})
     target_add_standalone_wrapper(TARGET ${SA_TARGET}
@@ -82,7 +82,7 @@ if (${SCXT_USE_CLAP_WRAPPER_STANDALONE})
             STATICALLY_LINKED_CLAP_ENTRY True
             PLUGIN_ID "org.surge-synth-team.shortcircuit-xt")
 else()
-    message(STATUS "Standalone is BaconPaul's Bodged Juce Thing")
+    message(STATUS "Standalone is provided by BaconPaul's Bodged Juce Thing")
     add_executable(${SA_TARGET} MACOSX_BUNDLE WIN32)
     set_target_properties(${SA_TARGET} PROPERTIES
             OUTPUT_NAME ${name})
diff --git a/libs/clap/clap-wrapper b/libs/clap/clap-wrapper
index e82e4d76..bdd7b86a 160000
--- a/libs/clap/clap-wrapper
+++ b/libs/clap/clap-wrapper
@@ -1 +1 @@
-Subproject commit e82e4d7628fe962a3df4bbecff0120bee7d39c31
+Subproject commit bdd7b86abbfc251f7a59bcf478af92faa6e42804