diff --git a/Makefile b/Makefile
index 77fe2351..5a7233cd 100644
--- a/Makefile
+++ b/Makefile
@@ -57,17 +57,33 @@ release/Etcher-win32-x64: .
 		--overwrite \
 		--out=release/
 
-package-osx: release/Etcher-darwin-x64
-package-linux: release/Etcher-linux-ia32 release/Etcher-linux-x64
-package-win32: release/Etcher-win32-ia32 release/Etcher-win32-x64
-package-all: package-osx package-linux package-win32
-
 release/installers/Etcher.dmg: release/Etcher-darwin-x64 package.json
 	$(ELECTRON_BUILDER) "$</$(APPLICATION_NAME).app" \
 		--platform=osx \
 		--out=release/installers
 
+release/installers/Etcher-x64.exe: release/Etcher-win32-x64 package.json
+	$(ELECTRON_BUILDER) $< \
+		--platform=win \
+		--out=release/installers/win-x64
+	mv release/installers/win-x64/Etcher\ Setup.exe $@
+	rmdir release/installers/win-x64
+
+release/installers/Etcher.exe: release/Etcher-win32-ia32 package.json
+	$(ELECTRON_BUILDER) $< \
+		--platform=win \
+		--out=release/installers/win-ia32
+	mv release/installers/win-ia32/Etcher\ Setup.exe $@
+	rmdir release/installers/win-ia32
+
+package-osx: release/Etcher-darwin-x64
+package-linux: release/Etcher-linux-ia32 release/Etcher-linux-x64
+package-win32: release/Etcher-win32-ia32 release/Etcher-win32-x64
+package-all: package-osx package-linux package-win32
+
 installer-osx: release/installers/Etcher.dmg
+installer-win32: release/installers/Etcher-x64.exe release/installers/Etcher.exe
+installer-all: installer-osx installer-win32
 
 clean:
 	rm -rf release/
diff --git a/PUBLISHING.md b/PUBLISHING.md
index 61edfc61..1e07982e 100644
--- a/PUBLISHING.md
+++ b/PUBLISHING.md
@@ -17,7 +17,7 @@ npm install --force
 Run the following command to package Etcher
 
 ```sh
-make installer-osx
+make installer-all
 ```
 
 The resulting packages will be saved to `release/installers`.
diff --git a/package.json b/package.json
index f9ded371..4a239b08 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,13 @@
         { "x": 415, "y": 225, "type": "link", "path": "/Applications" },
         { "x": 140, "y": 225, "type": "file" }
       ]
+    },
+    "win": {
+      "title" : "Etcher",
+      "version" : "0.0.1",
+      "publisher": "Resin.io",
+      "icon" : "assets/icon.ico",
+      "verbosity": 1
     }
   },
   "optionalDependencies": {