diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3793647..1b4e194 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -80,7 +80,7 @@ jobs:
         run: echo "::set-output name=sha8::$(echo ${{ steps.slug1.outputs.sha8 || steps.slug2.outputs.sha8 }})"
       - name: Pack binaries
         run: |
-          tar -c -h --hard-dereference -z -f ${{ github.event.repository.name }}-linux-arm64-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}.tar.gz -C bin $(ls bin | grep -e lv2 -e vst)  ../CardinalJACK ../CardinalNative
+          tar -c -h --hard-dereference -z -f ${{ github.event.repository.name }}-linux-arm64-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}.tar.gz -C bin $(ls bin | grep -e lv2 -e vst -e clap)  ../CardinalJACK ../CardinalNative
       - uses: actions/upload-artifact@v2
         with:
           name: ${{ github.event.repository.name }}-linux-arm64-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
@@ -164,7 +164,7 @@ jobs:
         run: echo "::set-output name=sha8::$(echo ${{ steps.slug1.outputs.sha8 || steps.slug2.outputs.sha8 }})"
       - name: Pack binaries
         run: |
-          tar -c -h --hard-dereference -z -f ${{ github.event.repository.name }}-linux-armhf-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}.tar.gz -C bin $(ls bin | grep -e lv2 -e vst)  ../CardinalJACK ../CardinalNative
+          tar -c -h --hard-dereference -z -f ${{ github.event.repository.name }}-linux-armhf-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}.tar.gz -C bin $(ls bin | grep -e lv2 -e vst -e clap)  ../CardinalJACK ../CardinalNative
       - uses: actions/upload-artifact@v2
         with:
           name: ${{ github.event.repository.name }}-linux-armhf-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
@@ -244,7 +244,7 @@ jobs:
         run: echo "::set-output name=sha8::$(echo ${{ steps.slug1.outputs.sha8 || steps.slug2.outputs.sha8 }})"
       - name: Pack binaries
         run: |
-          tar -c -h --hard-dereference -z -f ${{ github.event.repository.name }}-linux-i686-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}.tar.gz -C bin $(ls bin | grep -e lv2 -e vst) ../CardinalJACK ../CardinalNative
+          tar -c -h --hard-dereference -z -f ${{ github.event.repository.name }}-linux-i686-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}.tar.gz -C bin $(ls bin | grep -e lv2 -e vst -e clap) ../CardinalJACK ../CardinalNative
       - uses: actions/upload-artifact@v2
         with:
           name: ${{ github.event.repository.name }}-linux-i686-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
@@ -316,7 +316,7 @@ jobs:
         run: echo "::set-output name=sha8::$(echo ${{ steps.slug1.outputs.sha8 || steps.slug2.outputs.sha8 }})"
       - name: Pack binaries
         run: |
-          tar -c -h --hard-dereference -z -f ${{ github.event.repository.name }}-linux-x86_64-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}.tar.gz -C bin $(ls bin | grep -e lv2 -e vst)  ../CardinalJACK ../CardinalNative
+          tar -c -h --hard-dereference -z -f ${{ github.event.repository.name }}-linux-x86_64-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}.tar.gz -C bin $(ls bin | grep -e lv2 -e vst -e clap)  ../CardinalJACK ../CardinalNative
       - uses: actions/upload-artifact@v2
         with:
           name: ${{ github.event.repository.name }}-linux-x86_64-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
@@ -353,7 +353,7 @@ jobs:
         run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
       - name: Pack binaries
         run: |
-          tar -c -h --hard-dereference -z -f ${{ github.event.repository.name }}-linux-x86_64-debug-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}.tar.gz -C bin $(ls bin | grep -e lv2 -e vst)
+          tar -c -h --hard-dereference -z -f ${{ github.event.repository.name }}-linux-x86_64-debug-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}.tar.gz -C bin $(ls bin | grep -e lv2 -e vst -e clap)
       - uses: actions/upload-artifact@v2
         with:
           name: ${{ github.event.repository.name }}-linux-x86_64-debug-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
@@ -889,7 +889,7 @@ jobs:
         run: echo "::set-output name=sha8::$(echo ${{ steps.slug1.outputs.sha8 || steps.slug2.outputs.sha8 }})"
       - name: Pack binaries
         run: |
-          cd bin; zip -r -9 ../${{ github.event.repository.name }}-win32-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}.zip $(ls | grep -e lv2 -e vst)
+          cd bin; zip -r -9 ../${{ github.event.repository.name }}-win32-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}.zip $(ls | grep -e lv2 -e vst -e clap)
       - uses: actions/upload-artifact@v2
         with:
           name: ${{ github.event.repository.name }}-win32-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
@@ -981,7 +981,7 @@ jobs:
         run: echo "::set-output name=sha8::$(echo ${{ steps.slug1.outputs.sha8 || steps.slug2.outputs.sha8 }})"
       - name: Pack binaries
         run: |
-          cd bin; zip -r -9 ../${{ github.event.repository.name }}-win64-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}.zip $(ls | grep -e lv2 -e vst)
+          cd bin; zip -r -9 ../${{ github.event.repository.name }}-win64-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}.zip $(ls | grep -e lv2 -e vst -e clap)
       - uses: actions/upload-artifact@v2
         with:
           name: ${{ github.event.repository.name }}-win64-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
diff --git a/README.md b/README.md
index 7be0840..a992f99 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 *Cardinal, the Rack!*
 
 Cardinal is a free and open-source virtual modular synthesizer plugin,
-available as JACK standalone and AU, LV2, VST2 and VST3 audio plugin for FreeBSD, Linux, macOS and Windows.  
+available as JACK standalone and AU, LV2, VST2, VST3 and CLAP audio plugin for FreeBSD, Linux, macOS and Windows.  
 It is based on the popular [VCV Rack](https://vcvrack.com/) but with a focus on being a fully self-contained plugin version.
 
 More specifically, this is a [DPF-based](https://github.com/DISTRHO/DPF/)
@@ -25,7 +25,8 @@ All VCV branding has been removed (to the best of our knowledge) in order to avo
 Cardinal should be considered stable, if you spot any bugs please report them.  
 Currently the following should be noted:
 
-- Windows 32bit builds do not work well [#80](https://github.com/DISTRHO/Cardinal/issues/80)
+- CLAP support is a work-in-progress [DPF#383](https://github.com/DISTRHO/DPF/issues/383)
+- Windows 32bit builds still have a few problematic modules [#80](https://github.com/DISTRHO/Cardinal/issues/80)
 
 ### Stable release
 
@@ -62,9 +63,10 @@ All variants have MIDI input and output support.
 
 ### Main
 
-This variant provides 8 audio inputs and outputs and 10 CV inputs and outputs.  
+This variant provides 8 audio inputs and outputs and 10 CV inputs and outputs.
 
-NOTE: Due to AU and VST2 formats not supporting CV ports, this variant is not available for those formats.
+NOTE: Due to AU and VST2 formats not supporting CV ports, this variant is not available for those formats.  
+NOTE: This variant is not available in CLAP yet, to be added in a later release
 
 ### Synth
 
diff --git a/utils/create-macos-installer.sh b/utils/create-macos-installer.sh
index a465d2d..a757dd5 100755
--- a/utils/create-macos-installer.sh
+++ b/utils/create-macos-installer.sh
@@ -9,8 +9,8 @@ else
   exit
 fi
 
-rm -rf res jack native au lv2 vst2 vst3
-mkdir jack native au lv2 vst2 vst3
+rm -rf res jack native au lv2 vst2 vst3 clap
+mkdir jack native au lv2 vst2 vst3 clap
 
 mv Cardinal.app jack/CardinalJACK.app
 mv CardinalNative.app native/CardinalNative.app
@@ -19,10 +19,12 @@ mv *.component au/
 mv *.lv2 lv2/
 mv *.vst vst2/
 mv *.vst3 vst3/
+mv *.clap clap/
 cp -RL lv2/Cardinal.lv2/resources res
 rm -rf lv2/*.lv2/resources
 rm -rf vst2/*.vst/Contents/Resources
 rm -rf vst3/*.vst3/Contents/Resources
+rm -rf clap/*.clap/Contents/Resources
 
 pkgbuild \
   --identifier "studio.kx.distrho.cardinal.resources" \
@@ -66,6 +68,12 @@ pkgbuild \
   --root "${PWD}/vst3/" \
   ../dpf-cardinal-vst3bundles.pkg
 
+pkgbuild \
+  --identifier "studio.kx.distrho.plugins.cardinal.clapbundles" \
+  --install-location "/Library/Audio/Plug-Ins/CLAP/" \
+  --root "${PWD}/clap/" \
+  ../dpf-cardinal-clapbundles.pkg
+
 cd ..
 
 sed -e "s|@builddir@|${PWD}/build|" \
diff --git a/utils/inno/win32.iss b/utils/inno/win32.iss
index cff7ed9..e1b2294 100644
--- a/utils/inno/win32.iss
+++ b/utils/inno/win32.iss
@@ -27,6 +27,7 @@ Name: native; Description: "Standalone (Native)"; Types: custom;
 Name: lv2; Description: "LV2 plugin"; Types: normal;
 Name: vst2; Description: "VST2 plugin"; Types: normal;
 Name: vst3; Description: "VST3 plugin"; Types: normal;
+Name: clap; Description: "CLAP plugin"; Types: normal;
 
 [Files]
 #include "resources.iss"
@@ -59,6 +60,8 @@ Source: "..\..\bin\Cardinal.vst\*.*"; DestDir: "{commoncf32}\VST2\Cardinal.vst";
 Source: "..\..\bin\Cardinal.vst3\Contents\x86-win\Cardinal.vst3"; DestDir: "{commoncf32}\VST3\Cardinal.vst3\Contents\x86-win"; Components: vst3; Flags: ignoreversion;
 Source: "..\..\bin\CardinalFX.vst3\Contents\x86-win\CardinalFX.vst3"; DestDir: "{commoncf32}\VST3\CardinalFX.vst3\Contents\x86-win"; Components: vst3; Flags: ignoreversion;
 Source: "..\..\bin\CardinalSynth.vst3\Contents\x86-win\CardinalSynth.vst3"; DestDir: "{commoncf32}\VST3\CardinalSynth.vst3\Contents\x86-win"; Components: vst3; Flags: ignoreversion;
+; clap
+Source: "..\..\bin\Cardinal.clap\*.*"; DestDir: "{commoncf32}\CLAP\Cardinal.clap"; Components: clap; Flags: ignoreversion;
 
 [Icons]
 Name: "{commonprograms}\Cardinal (JACK)"; Filename: "{app}\Cardinal.exe"; IconFilename: "{app}\distrho.ico"; WorkingDir: "{app}"; Comment: "Virtual modular synthesizer plugin (JACK variant)"; Components: jack;
diff --git a/utils/inno/win64.iss b/utils/inno/win64.iss
index 90cfa81..d519ca8 100644
--- a/utils/inno/win64.iss
+++ b/utils/inno/win64.iss
@@ -28,6 +28,7 @@ Name: native; Description: "Standalone (Native)"; Types: custom;
 Name: lv2; Description: "LV2 plugin"; Types: normal;
 Name: vst2; Description: "VST2 plugin"; Types: normal;
 Name: vst3; Description: "VST3 plugin"; Types: normal;
+Name: clap; Description: "CLAP plugin"; Types: normal;
 
 [Files]
 #include "resources.iss"
@@ -60,6 +61,8 @@ Source: "..\..\bin\Cardinal.vst\*.*"; DestDir: "{commoncf64}\VST2\Cardinal.vst";
 Source: "..\..\bin\Cardinal.vst3\Contents\x86_64-win\Cardinal.vst3"; DestDir: "{commoncf64}\VST3\Cardinal.vst3\Contents\x86_64-win"; Components: vst3; Flags: ignoreversion;
 Source: "..\..\bin\CardinalFX.vst3\Contents\x86_64-win\CardinalFX.vst3"; DestDir: "{commoncf64}\VST3\CardinalFX.vst3\Contents\x86_64-win"; Components: vst3; Flags: ignoreversion;
 Source: "..\..\bin\CardinalSynth.vst3\Contents\x86_64-win\CardinalSynth.vst3"; DestDir: "{commoncf64}\VST3\CardinalSynth.vst3\Contents\x86_64-win"; Components: vst3; Flags: ignoreversion;
+; clap
+Source: "..\..\bin\Cardinal.clap\*.*"; DestDir: "{commoncf64}\CLAP\Cardinal.clap"; Components: clap; Flags: ignoreversion;
 
 [Icons]
 Name: "{commonprograms}\Cardinal (JACK)"; Filename: "{app}\Cardinal.exe"; IconFilename: "{app}\distrho.ico"; WorkingDir: "{app}"; Comment: "Virtual modular synthesizer plugin (JACK variant)"; Components: jack;
diff --git a/utils/macOS/package.xml.in b/utils/macOS/package.xml.in
index 381a28b..ca2f4da 100644
--- a/utils/macOS/package.xml.in
+++ b/utils/macOS/package.xml.in
@@ -27,6 +27,9 @@
     <choice id="studio.kx.distrho.cardinal-vst3" title="VST3" description="Install VST3 plugins" visible="true">
         <pkg-ref id="studio.kx.distrho.cardinal-vst3bundles" version="0">dpf-cardinal-vst3bundles.pkg</pkg-ref>
     </choice>
+    <choice id="studio.kx.distrho.cardinal-clap" title="CLAP" description="Install CLAP plugins" visible="true">
+        <pkg-ref id="studio.kx.distrho.cardinal-clapbundles" version="0">dpf-cardinal-clapbundles.pkg</pkg-ref>
+    </choice>
     <choices-outline>
         <line choice="studio.kx.distrho.cardinal-res"/>
         <line choice="studio.kx.distrho.cardinal-jack"/>
@@ -35,5 +38,6 @@
         <line choice="studio.kx.distrho.cardinal-lv2"/>
         <line choice="studio.kx.distrho.cardinal-vst2"/>
         <line choice="studio.kx.distrho.cardinal-vst3"/>
+        <line choice="studio.kx.distrho.cardinal-clap"/>
     </choices-outline>
 </installer-gui-script>