diff --git a/Makefile b/Makefile
index 2195f991..444ebb7d 100644
--- a/Makefile
+++ b/Makefile
@@ -146,6 +146,11 @@ github-release: cloudflared
 github-message:
 	python3 github_message.py --release-version $(VERSION)
 
+.PHONY: github-mac-upload
+github-mac-upload:
+	python3 github_release.py --path .artifacts/cloudflared-darwin-amd64.tgz --release-version $(VERSION) --name cloudflared-darwin-amd64.tgz
+	python3 github_release.py --path .artifacts/cloudflared-amd64.pkg --release-version $(VERSION) --name cloudflared-amd64.pkg
+
 bin/equinox:
 	mkdir -p bin
 	curl -s https://bin.equinox.io/c/75JtLRTsJ3n/release-tool-beta-$(EQUINOX_PLATFORM).tgz | tar xz -C bin/
diff --git a/cfsetup.yaml b/cfsetup.yaml
index 3b02b3bf..7b4c46ab 100644
--- a/cfsetup.yaml
+++ b/cfsetup.yaml
@@ -172,6 +172,15 @@ stretch: &stretch
       - export GOARCH=arm64
       - export CC=aarch64-linux-gnu-gcc
       - make github-release
+  github-release-macos-amd64:
+    build_dir: *build_dir
+    builddeps:
+      - *pinned_go
+      - python3-setuptools
+      - python3-pip
+    post-cache:
+      - pip3 install pygithub
+      - make github-mac-upload
   test:
     build_dir: *build_dir
     builddeps: