diff --git a/Makefile b/Makefile
index 40fdf03f..56490eec 100644
--- a/Makefile
+++ b/Makefile
@@ -93,8 +93,14 @@ funding-wallet-local:
 		--rpc-access-control-origins http://localhost:8080 \
 		--wallet-dir ./.localnet
 
+# use .bat extension for windows binaries
+APP_EXT :=
+ifeq ($(OS),Windows_NT)
+	APP_EXT := .bat
+endif
+
 seednode-local:
-	./haveno-seednode \
+	./haveno-seednode$(APP_EXT) \
 		--baseCurrencyNetwork=XMR_LOCAL \
 		--useLocalhostForP2P=true \
 		--useDevPrivilegeKeys=true \
@@ -104,7 +110,7 @@ seednode-local:
 
 arbitrator-daemon-local:
 	# Arbitrator needs to be registered before making trades
-	./haveno-daemon \
+	./haveno-daemon$(APP_EXT) \
 		--baseCurrencyNetwork=XMR_LOCAL \
 		--useLocalhostForP2P=true \
 		--useDevPrivilegeKeys=true \
@@ -116,7 +122,7 @@ arbitrator-daemon-local:
 
 arbitrator-desktop-local:
 	# Arbitrator needs to be registered before making trades
-	./haveno-desktop \
+	./haveno-desktop$(APP_EXT) \
 		--baseCurrencyNetwork=XMR_LOCAL \
 		--useLocalhostForP2P=true \
 		--useDevPrivilegeKeys=true \
@@ -127,7 +133,7 @@ arbitrator-desktop-local:
 
 arbitrator-desktop2-local:
 	# Arbitrator needs to be registered before making trades
-	./haveno-desktop \
+	./haveno-desktop$(APP_EXT) \
 		--baseCurrencyNetwork=XMR_LOCAL \
 		--useLocalhostForP2P=true \
 		--useDevPrivilegeKeys=true \
@@ -137,7 +143,7 @@ arbitrator-desktop2-local:
 		--apiPort=10001
 
 user1-daemon-local:
-	./haveno-daemon \
+	./haveno-daemon$(APP_EXT) \
 		--baseCurrencyNetwork=XMR_LOCAL \
 		--useLocalhostForP2P=true \
 		--useDevPrivilegeKeys=true \
@@ -149,7 +155,7 @@ user1-daemon-local:
 		--passwordRequired=false
 
 user1-desktop-local:
-	./haveno-desktop \
+	./haveno-desktop$(APP_EXT) \
 		--baseCurrencyNetwork=XMR_LOCAL \
 		--useLocalhostForP2P=true \
 		--useDevPrivilegeKeys=true \
@@ -160,7 +166,7 @@ user1-desktop-local:
 		--walletRpcBindPort=38091
 
 user2-desktop-local:
-	./haveno-desktop \
+	./haveno-desktop$(APP_EXT) \
 		--baseCurrencyNetwork=XMR_LOCAL \
 		--useLocalhostForP2P=true \
 		--useDevPrivilegeKeys=true \
@@ -171,7 +177,7 @@ user2-desktop-local:
 		--walletRpcBindPort=38092
 
 user2-daemon-local:
-	./haveno-daemon \
+	./haveno-daemon$(APP_EXT) \
 		--baseCurrencyNetwork=XMR_LOCAL \
 		--useLocalhostForP2P=true \
 		--useDevPrivilegeKeys=true \
@@ -191,7 +197,7 @@ monerod-stagenet:
 		--rpc-access-control-origins http://localhost:8080 \
 
 seednode-stagenet:
-	./haveno-seednode \
+	./haveno-seednode$(APP_EXT) \
 		--baseCurrencyNetwork=XMR_STAGENET \
 		--useLocalhostForP2P=false \
 		--useDevPrivilegeKeys=false \
@@ -200,7 +206,7 @@ seednode-stagenet:
 
 arbitrator-daemon-stagenet:
 	# Arbitrator needs to be registered before making trades
-	./haveno-daemon \
+	./haveno-daemon$(APP_EXT) \
 		--baseCurrencyNetwork=XMR_STAGENET \
 		--useLocalhostForP2P=false \
 		--useDevPrivilegeKeys=false \
@@ -212,7 +218,7 @@ arbitrator-daemon-stagenet:
 
 arbitrator-desktop-stagenet:
 	# Arbitrator needs to be registered before making trades
-	./haveno-desktop \
+	./haveno-desktop$(APP_EXT) \
 		--baseCurrencyNetwork=XMR_STAGENET \
 		--useLocalhostForP2P=false \
 		--useDevPrivilegeKeys=false \
@@ -222,7 +228,7 @@ arbitrator-desktop-stagenet:
 		--apiPort=9998
 
 user1-daemon-stagenet:
-	./haveno-daemon \
+	./haveno-daemon$(APP_EXT) \
 		--baseCurrencyNetwork=XMR_STAGENET \
 		--useLocalhostForP2P=false \
 		--useDevPrivilegeKeys=false \
@@ -234,7 +240,7 @@ user1-daemon-stagenet:
 		--passwordRequired=false
 
 user1-desktop-stagenet:
-	./haveno-desktop \
+	./haveno-desktop$(APP_EXT) \
 		--baseCurrencyNetwork=XMR_STAGENET \
 		--useLocalhostForP2P=false \
 		--useDevPrivilegeKeys=false \
@@ -245,7 +251,7 @@ user1-desktop-stagenet:
 		--walletRpcBindPort=38091
 
 user2-daemon-stagenet:
-	./haveno-daemon \
+	./haveno-daemon$(APP_EXT) \
 		--baseCurrencyNetwork=XMR_STAGENET \
 		--useLocalhostForP2P=false \
 		--useDevPrivilegeKeys=false \
@@ -257,7 +263,7 @@ user2-daemon-stagenet:
 		--passwordRequired=false
 
 user2-desktop-stagenet:
-	./haveno-desktop \
+	./haveno-desktop$(APP_EXT) \
 		--baseCurrencyNetwork=XMR_STAGENET \
 		--useLocalhostForP2P=false \
 		--useDevPrivilegeKeys=false \
@@ -268,7 +274,7 @@ user2-desktop-stagenet:
 		--walletRpcBindPort=38092
 
 user3-desktop-stagenet:
-	./haveno-desktop \
+	./haveno-desktop$(APP_EXT) \
 		--baseCurrencyNetwork=XMR_STAGENET \
 		--useLocalhostForP2P=false \
 		--useDevPrivilegeKeys=false \
diff --git a/docs/installing.md b/docs/installing.md
index e17bd82a..8af0e262 100644
--- a/docs/installing.md
+++ b/docs/installing.md
@@ -4,7 +4,20 @@ These are the steps needed to build Haveno and test it on our test network or lo
 
 ## Install dependencies
 
-On Ubuntu: `sudo apt install make wget git openjdk-11-jdk`. The Monero binaries will be downloaded and verified automatically in the next step.
+On Ubuntu: `sudo apt install make wget git openjdk-11-jdk`
+
+On Windows:
+
+  1. Download [Java JDK 11](https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_windows-x64_bin.zip) and extract to C:\Program Files\Java\jdk-11.0.2.
+  2. Add a new user environment variable called `JAVA_HOME` with value `C:\Program Files\Java\jdk-11.0.2` (Windows search > "Edit the system environment variables" > Environment variables...)
+  3. Install [MSYS2](https://www.msys2.org/).
+  4. Start MSYS2 MINGW64 or MSYS MINGW32 depending on your system. Use MSYS2 for all commands throughout this document.
+  5. Update pacman: `pacman -Syy`
+  6. Install dependencies:
+
+      64-bit: `pacman -S mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake git`
+
+      32-bit: `pacman -S mingw-w64-i686-toolchain make mingw-w64-i686-cmake git`
 
 ## Build Haveno
 
@@ -33,6 +46,8 @@ On **Linux**: remove everything inside `~/.local/share/haveno-*/xmr_stagenet/`,
 
 On **Mac**: remove everything inside `~/Library/Application\ Support/haveno-*/xmr_stagenet/`, except the `wallet` folder.
 
+On **Windows**: remove everything inside `~\AppData\Roaming\haveno-*/xmr_stagenet/`, except the `wallet` folder.
+
 ## Join the public test network
 
 If you want to try Haveno in a live setup, launch a Haveno instance that will connect to other peers on our public test environment, which runs on Monero's stagenet (you won't need to download the blockchain locally). You'll be able to make test trades with other users and have a preview of Haveno's trade protocol in action. Note that development is very much ongoing. Things are slow and might break.