diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 988169287..f8d0082e8 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -16,12 +16,14 @@ jobs:
         with:
           submodules: recursive
           fetch-depth: 0
-
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2
         with:
           key: macos
 
+      - name: install jack
+        run: brew install jack
+
       - name: Create Build Environment
         run: cmake -E make_directory ${{github.workspace}}/build
 
@@ -99,6 +101,9 @@ jobs:
         with:
           key: macos-legacy
 
+      - name: install jack
+        run: brew install jack
+
       - name: Create Build Environment
         run: cmake -E make_directory ${{github.workspace}}/build
 
@@ -170,6 +175,12 @@ jobs:
           submodules: recursive
           fetch-depth: 0
 
+      - name: Install winget
+        uses: Cyberboss/install-winget@v1
+
+      - name: Install jack
+        run: winget install jack2 --disable-interactivity --accept-source-agreements
+
       - name: Create Build Environment
         run: cmake -E make_directory ${{github.workspace}}/build
 
@@ -225,6 +236,12 @@ jobs:
           submodules: recursive
           fetch-depth: 0
 
+      - name: Install winget
+        uses: Cyberboss/install-winget@v1
+
+      - name: Install jack
+        run: winget install jack2 --disable-interactivity --accept-source-agreements
+
       - name: Create Build Environment
         run: cmake -E make_directory ${{github.workspace}}/build
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6bcc7f960..5f7dbbcbd 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -237,12 +237,13 @@ set(JUCE_COMPILE_DEFINITIONS
     JUCE_SILENCE_XCODE_15_LINKER_WARNING=1
     JUCE_USE_XRENDER=1
     JUCE_COREGRAPHICS_RENDER_WITH_MULTIPLE_PAINT_CALLS=0
+    JUCE_JACK=1
+    JUCE_JACK_CLIENT_NAME="plugdata"
 )
 
 if(LINUX)
- list(APPEND JUCE_COMPILE_DEFINITIONS JUCE_ALSA=1 JUCE_JACK=1 JUCE_JACK_CLIENT_NAME="plugdata")
+ list(APPEND JUCE_COMPILE_DEFINITIONS JUCE_ALSA=1)
 elseif(UNIX AND NOT APPLE) # BSD
-  list(APPEND JUCE_COMPILE_DEFINITIONS JUCE_JACK=1 JUCE_JACK_CLIENT_NAME="plugdata")
   add_compile_definitions(BSD=1 ENABLE_OPUS=0)
 endif()
 
@@ -330,6 +331,20 @@ include_directories(/usr/local/include)
 link_directories(/usr/local/lib)
 endif()
 
+# macOS includes for jack
+if(APPLE)
+  if(MACOS_LEGACY)
+    include_directories(/usr/local/include)
+  else()
+    include_directories(/opt/homebrew/include)
+  endif()
+endif()
+
+# Windows include for jack
+if(MSVC)
+  include_directories("C:\\Program Files\\JACK2\\include")
+endif()
+
 list(APPEND PLUGDATA_COMPILE_DEFINITIONS JUCE_MODAL_LOOPS_PERMITTED=1)
 
 list(APPEND PLUGDATA_INCLUDE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/Libraries/ELSE/sfont~/")
diff --git a/Libraries/JUCE b/Libraries/JUCE
index d924b5908..60f33c4af 160000
--- a/Libraries/JUCE
+++ b/Libraries/JUCE
@@ -1 +1 @@
-Subproject commit d924b5908ccc6b9f857b0d8d488304c4eaaf1f1d
+Subproject commit 60f33c4afdedf6da2b1fc84720b6cae6cb6eceb6