diff --git a/.github/workflows/create-github-release.yml b/.github/workflows/create-github-release.yml
index 3f919bf..424c6e4 100644
--- a/.github/workflows/create-github-release.yml
+++ b/.github/workflows/create-github-release.yml
@@ -37,6 +37,7 @@ jobs:
         run: |
           cp build/gohangout-windows-x64-${GITHUB_REF_NAME}.exe gohangout-windows-x64.exe
           cp build/gohangout-windows-386-${GITHUB_REF_NAME}.exe gohangout-windows-386.exe
+          cp build/gohangout-windows-arm64-${GITHUB_REF_NAME}.exe gohangout-windows-arm64.exe
           cp build/gohangout-linux-x64-${GITHUB_REF_NAME} gohangout-linux-x64
           cp build/gohangout-linux-386-${GITHUB_REF_NAME} gohangout-linux-386
           cp build/gohangout-darwin-x64-${GITHUB_REF_NAME} gohangout-darwin-x64
@@ -66,6 +67,17 @@ jobs:
           asset_name: gohangout-linux-386
           asset_content_type: application/zip
 
+      - name: Upload linux-arm64
+        id: upload-linux-arm64
+        uses: actions/upload-release-asset@v1.0.2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GOHANGOUT_UPLOAD_ASSET_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: gohangout-linux-arm64
+          asset_name: gohangout-linux-arm64
+          asset_content_type: application/zip
+
       - name: Upload windows-x64
         id: upload-windows-x64
         uses: actions/upload-release-asset@v1.0.2
@@ -88,13 +100,3 @@ jobs:
           asset_name: gohangout-windows-386.exe
           asset_content_type: application/zip
 
-      - name: Upload darwin-x64
-        id: upload-darwin-x64
-        uses: actions/upload-release-asset@v1.0.2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GOHANGOUT_UPLOAD_ASSET_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: gohangout-darwin-x64
-          asset_name: gohangout-darwin-x64
-          asset_content_type: application/zip
diff --git a/Makefile b/Makefile
index f74cd6c..c771776 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,7 @@ all: check
 	GOOS=windows GOARCH=386 CGO_ENABLED=0 go build -ldflags "-X main.version=$(hash)" -o build/gohangout-windows-386-$(tag).exe
 	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags "-X main.version=$(hash)" -o build/gohangout-linux-x64-$(tag)
 	GOOS=linux GOARCH=386 CGO_ENABLED=0 go build -ldflags "-X main.version=$(hash)" -o build/gohangout-linux-386-$(tag)
+	GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -ldflags "-X main.version=$(hash)" -o build/gohangout-linux-arm64-$(tag)
 	GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -ldflags "-X main.version=$(hash)" -o build/gohangout-darwin-x64-$(tag)
 
 clean: