diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index ec52e94606d..874dec05909 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -369,9 +369,9 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifacts/wasmer-windows-amd64/wasmer.tar.gz
-          asset_name: wasmer-windows-amd64.tar.gz
-          asset_content_type: application/gzip
+          asset_path: artifacts/wasmer-windows-amd64/wasmer.zip
+          asset_name: wasmer-windows-amd64.zip
+          asset_content_type: application/zip
 
       - name: Upload Release Asset Linux amd64
         uses: actions/upload-release-asset@v1
diff --git a/Makefile b/Makefile
index 9ffaa95fc02..8319b4ab55b 100644
--- a/Makefile
+++ b/Makefile
@@ -414,9 +414,12 @@ distribution: package
 ifeq ($(OS), Windows_NT)
 	iscc scripts/windows-installer/wasmer.iss
 	cp scripts/windows-installer/WasmerInstaller.exe dist/
-endif
+	cd package && zip -r ../wasmer.zip . && cd -
+	mv wasmer.zip dist/
+else
 	tar -C package -zcvf wasmer.tar.gz bin lib include LICENSE ATTRIBUTIONS
 	mv wasmer.tar.gz dist/
+endif
 
 #################
 # Miscellaneous #