diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9cbb2da..68a2b82 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -25,6 +25,8 @@ jobs:
         run: /opt/hostedtoolcache/go/1.19.1/x64/bin/go build -o WattenServer/bin/WattenServer ./WattenServer
       - name: Build for Windows
         run: GOOS=windows GOARCH=amd64 /opt/hostedtoolcache/go/1.19.1/x64/bin/go build -o WattenServer/bin/WattenServer.exe ./WattenServer
+      - name: Build for MacOS
+        run: GOOS=darwin GOARCH=amd64 /opt/hostedtoolcache/go/1.19.1/x64/bin/go build -o WattenServer/bin/Wattenserver.app ./WattenServer
       - name: ZIP Files
         run: |
           cd WattenServer
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f186ba4..91f3c0d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -29,3 +29,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - run: cd WattenServer; GOOS=windows GOARCH=amd64 /opt/hostedtoolcache/go/1.19.1/x64/bin/go build
+  Test_WattenServer_Build_For_MacOS:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - run: cd WattenServer; GOOS=darwin GOARCH=amd64 /opt/hostedtoolcache/go/1.19.1/x64/bin/go build
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 491c479..2f9643e 100644
--- a/Makefile
+++ b/Makefile
@@ -12,8 +12,11 @@ build_WattenServer_Linux:
 build_WattenServer_Windows:
 	GOOS=windows GOARCH=amd64 go build -o WattenServer/bin/WattenServer.exe ./WattenServer
 
-build_all: build_WattenServer_Linux build_WattenServer_Windows
+build_WattenServer_MacOS:
+	GOOS=darwin GOARCH=amd64 go build -o WattenServer/bin/WattenServer.app ./WattenServer
+
+build_all: build_WattenServer_Linux build_WattenServer_Windows build_WattenServer_MacOS
 
 zip_program: build_all
 	- rm WattenServer/watten.zip
-	cd WattenServer; zip -r watten.zip *.js *.html svg; zip -jr watten.zip bin
\ No newline at end of file
+	cd WattenServer; zip -r watten.zip *.js *.html svg; zip -jr watten.zip bin