diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b12c9307c8..b20905e0794 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 - [#1985](https://github.com/wasmerio/wasmer/pull/1985) Bump minimum supported Rust version to 1.48
 
 ### Fixed
+- [#2007](https://github.com/wasmerio/wasmer/pull/2007) Fix packaging of wapm on Windows
 - [#2005](https://github.com/wasmerio/wasmer/pull/2005) Emscripten is now working again.
 
 ## 1.0.0 - 2021-01-05
diff --git a/Makefile b/Makefile
index a8f43026f40..af7f7a89314 100644
--- a/Makefile
+++ b/Makefile
@@ -286,12 +286,16 @@ test-integration:
 #############
 
 package-wapm:
-ifneq ($(OS), Windows_NT)
 	mkdir -p "package/bin"
+ifneq ($(OS), Windows_NT)
+	if [ -d "wapm-cli" ]; then \
+		cp wapm-cli/target/release/wapm package/bin/ ;\
+		echo "#!/bin/bash\nwapm execute \"\$$@\"" > package/bin/wax ;\
+		chmod +x package/bin/wax ;\
+	fi
+else
 	if [ -d "wapm-cli" ]; then \
-		cp wapm-cli/target/release/wapm package/bin/; \
-		echo "#!/bin/bash\nwapm execute \"\$$@\"" > package/bin/wax; \
-		chmod +x package/bin/wax; \
+		cp wapm-cli/target/release/wapm package/bin/ ;\
 	fi
 endif