diff --git a/tools/wallet-tool b/tools/wallet-tool
index 2b45334cb..306a7143f 100755
--- a/tools/wallet-tool
+++ b/tools/wallet-tool
@@ -12,4 +12,4 @@ if [ ! -e target/bitcoinj-tools-*.jar ] || [[ "$ALWAYS_BUILD_WALLETTOOL" != "" ]
   mvn package -DskipTests
 fi
 
-java -server -jar target/bitcoinj-tools-*.jar $*
+java -jar target/bitcoinj-tools-*.jar $*
diff --git a/tools/wallet-tool.cmd b/tools/wallet-tool.cmd
new file mode 100644
index 000000000..27ba9845b
--- /dev/null
+++ b/tools/wallet-tool.cmd
@@ -0,0 +1,21 @@
+@echo off
+rem Check if the jar has been built.
+set TARGET_JAR=bitcoinj-tools-*.jar
+
+if not exist "target/%TARGET_JAR%" goto BUILD
+if defined ALWAYS_BUILD_WALLETTOOL goto BUILD
+goto RUN
+
+:BUILD
+
+echo Compiling WalletTool to a JAR
+cd ../core
+call mvn install -DskipTests
+cd ../tools
+if exist "target/%TARGET_JAR%" del "target\%TARGET_JAR%"
+call mvn package -DskipTests
+
+:RUN
+
+for /R "target/" %%F in (%TARGET_JAR%) do set JAR_NAME=%%~nxF
+java -jar "target/%JAR_NAME%" %1 %2 %3 %4 %5 %6 %7 %8
\ No newline at end of file