diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 71fef51..aad776d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,60 +1,70 @@
 name: Build and publish
+
 on:
   push:
-    # Sequence of patterns matched against refs/tags
     tags:
-    - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+      - 'v*'
 
 jobs:
   make_bin:
     name: Build binary
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        include:
+          - os: ubuntu-latest
+            artifact_name: tmux-helper-linux
+          - os: macos-latest
+            artifact_name: tmux-helper-macos
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
-      - name: Pre-build
+
+      - name: Pre-build (Linux only)
+        if: matrix.os == 'ubuntu-latest'
         run: sudo apt install -y libdbus-1-dev pkg-config libdbus-1-3 libfuse-dev
-      - uses: actions/checkout@v2
+
       - name: Build binary
         run: cargo build --release
+
       - name: Upload binary
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v2
         with:
-          name: tmux-helper
+          name: ${{ matrix.artifact_name }}
           path: ./target/release/tmux-helper
+
   make_arch:
-      name: Make Arch Linux package
-      runs-on: ubuntu-latest
-      container:
-        image: archlinux
-        options: --privileged
-        volumes:
-          - /sys/fs/cgroup:/sys/fs/cgroup
-      steps:
-        - uses: actions/checkout@v2
-        - name: Build Arch Linux package
-          uses: FFY00/build-arch-package@master
-          with:
-            PKGBUILD: $GITHUB_WORKSPACE/.github/workflows/PKGBUILD
-            OUTDIR: $HOME/arch-packages
-        - run: mv $HOME/arch-packages/*pkg.tar.zst tmux-helper-x86_64.pkg.tar.zst
-        - name: Upload Arch Package
-          uses: actions/upload-artifact@v1
-          with:
-            name: arch_linux_tmux-helper-x86_64.pkg.tar.zst
-            path: ./tmux-helper-x86_64.pkg.tar.zst
+    name: Make Arch Linux package
+    runs-on: ubuntu-latest
+    container:
+      image: archlinux
+      options: --privileged
+    steps:
+      - uses: actions/checkout@v2
+      - name: Build Arch Linux package
+        uses: FFY00/build-arch-package@master
+        with:
+          PKGBUILD: $GITHUB_WORKSPACE/.github/workflows/PKGBUILD
+          OUTDIR: $HOME/arch-packages
+      - run: mv $HOME/arch-packages/*pkg.tar.zst tmux-helper-x86_64.pkg.tar.zst
+      - name: Upload Arch Package
+        uses: actions/upload-artifact@v2
+        with:
+          name: arch_linux_tmux-helper-x86_64.pkg.tar.zst
+          path: ./tmux-helper-x86_64.pkg.tar.zst
 
   publish:
     name: Publish release
     needs: [make_bin, make_arch]
     runs-on: ubuntu-latest
     steps:
-      - name: Get the version (git tag)
+      - name: Get version
         id: get_version
         run: |
-          echo ${GITHUB_REF/refs\/tags\/v/}
           echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\/v/}
           echo ::set-output name=FULL_TAG::${GITHUB_REF/refs\/tags\//}
+
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1
@@ -65,20 +75,32 @@ jobs:
           release_name: Release ${{ github.ref }}
           draft: false
           prerelease: false
-      - name: Download binary
-        uses: actions/download-artifact@v1
+
+      - name: Download Linux binary
+        uses: actions/download-artifact@v2
         with:
-          name: tmux-helper
+          name: tmux-helper-linux
           path: ./
-      - name: Download Arch Package
-        uses: actions/download-artifact@v1
+
+      - name: Download macOS binary
+        uses: actions/download-artifact@v2
+        with:
+          name: tmux-helper-macos
+          path: ./
+
+      - name: Download Arch package
+        uses: actions/download-artifact@v2
         with:
           name: arch_linux_tmux-helper-x86_64.pkg.tar.zst
           path: ./
+
       - name: Upload binary assets
         run: |
-           wget https://github.com/aktau/github-release/releases/download/v0.7.2/linux-amd64-github-release.tar.bz2
-           tar xjf linux-amd64-github-release.tar.bz2
-           export GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
-           ./bin/linux/amd64/github-release upload -u house-of-vanity -r tmux-helper --tag ${{ steps.get_version.outputs.FULL_TAG }} --name arch_linux_tmux-helper-${{ steps.get_version.outputs.VERSION }}-x86_64.pkg.tar.zst --file ./tmux-helper-x86_64.pkg.tar.zst
-           ./bin/linux/amd64/github-release upload -u house-of-vanity -r tmux-helper --tag ${{ steps.get_version.outputs.FULL_TAG }} --name tmux-helper-${{ steps.get_version.outputs.VERSION }} --file ./tmux-helper
+          wget https://github.com/aktau/github-release/releases/download/v0.7.2/linux-amd64-github-release.tar.bz2
+          tar xjf linux-amd64-github-release.tar.bz2
+          export GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
+
+          ./bin/linux/amd64/github-release upload -u house-of-vanity -r tmux-helper --tag ${{ steps.get_version.outputs.FULL_TAG }} --name arch_linux_tmux-helper-${{ steps.get_version.outputs.VERSION }}-x86_64.pkg.tar.zst --file ./tmux-helper-x86_64.pkg.tar.zst
+
+          ./bin/linux/amd64/github-release
+