diff --git a/build_create_app_linux.sh b/build_create_app_linux.sh
new file mode 100644
index 0000000000..41ee3f49c9
--- /dev/null
+++ b/build_create_app_linux.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+mvn clean package -DskipTests -Dmaven.javadoc.skip=true
+cp gui/target/shaded.jar gui/updatefx/builds/1.jar
+
+# edit url
+java -jar ./updatefx/updatefx-app-1.2.jar --url=http://localhost:8000/ gui/updatefx
+
+# Note: fakeroot needs to be installed on linux
+$JAVA_HOME/bin/javapackager \
+    -deploy \
+    -BappVersion=0.1 \
+    -Bcategory=Finance \
+    -Bemail=info@bitsquare.io \
+    -BlicenseType=GPLv3 \
+    -native deb \
+    -name Bitsquare \
+    -title Bitsquare \
+    -vendor Bitsquare \
+    -outdir gui/deploy \
+    -srcfiles gui/updatefx/builds/processed/1.jar \
+    -appclass io.bitsquare.app.gui.BitsquareAppMain \
+    -outfile Bitsquare
+    
+# TODO icons:  -Bicon=client/icons/icon.png \
diff --git a/build_create_app_mac.sh b/build_create_app_mac.sh
index 616d79da01..562b2ce0da 100644
--- a/build_create_app_mac.sh
+++ b/build_create_app_mac.sh
@@ -1,13 +1,22 @@
 #!/bin/bash
 
-# edit path
-cd /Users/mk/Documents/_intellij/bitsquare_UpdateFX_maven 
-
 mvn clean package -DskipTests -Dmaven.javadoc.skip=true
 cp gui/target/shaded.jar gui/updatefx/builds/1.jar
 
 # edit url
 java -jar ./updatefx/updatefx-app-1.2.jar --url=http://localhost:8000/ gui/updatefx
 
-# edit JAVA_HOME and different OS binaries
-/Library/Java/JavaVirtualMachines/jdk1.8.0_20.jdk/Contents/Home/bin/javapackager -deploy -outdir gui/deploy/ -outfile Bitsquare.dmg -name Bitsquare -native dmg -appclass io.bitsquare.app.gui.BitsquareAppMain -srcfiles gui/updatefx/builds/processed/1.jar
+$JAVA_HOME/bin/javapackager \
+    -deploy \
+    -BappVersion=0.1 \
+    -Bmac.CFBundleIdentifier=bitsquare \
+    -Bmac.CFBundleName=Bitsquare \
+    -Bruntime="$JAVA_HOME/../../" \
+    -native dmg \
+    -name Bitsquare \
+    -title Bitsquare \
+    -vendor Bitsquare \
+    -outdir gui/deploy \
+    -srcfiles gui/updatefx/builds/processed/1.jar \
+    -appclass io.bitsquare.app.gui.BitsquareAppMain \
+    -outfile Bitsquare
\ No newline at end of file
diff --git a/build_create_app_win.bat b/build_create_app_win.bat
new file mode 100644
index 0000000000..7dc0da8324
--- /dev/null
+++ b/build_create_app_win.bat
@@ -0,0 +1,21 @@
+mvn clean package -DskipTests -Dmaven.javadoc.skip=true
+cp gui\target\shaded.jar gui\updatefx\builds\1.jar
+
+:: edit url
+java -jar ./updatefx/updatefx-app-1.2.jar --url=http://localhost:8000/ gui/updatefx
+
+echo $JAVA_HOME
+echo $JAVA_HOME\..\..\
+
+$JAVA_HOME\bin\javapackager ^
+    -deploy ^
+    -BappVersion=0.1 ^
+    -Bruntime="$JAVA_HOME\..\..\" ^
+    -native exe ^
+    -name Bitsquare ^
+    -title Bitsquare ^
+    -vendor Bitsquare ^
+    -outdir gui\deploy ^
+    -srcfiles gui\updatefx\builds\processed\1.jar ^
+    -appclass io.bitsquare.app.gui.BitsquareAppMain ^
+    -outfile Bitsquare
\ No newline at end of file
diff --git a/build_setup.sh b/build_setup.sh
index 8d3a5c8292..2a8c1317a6 100644
--- a/build_setup.sh
+++ b/build_setup.sh
@@ -1,18 +1,17 @@
 #!/bin/bash
 
 # setup dirs
-cd /Users/admin_mbp/Dropbox/Bitsquare2
 mkdir gui/updatefx
 mkdir gui/updatefx/builds
 mkdir gui/updatefx/builds/processed
 mkdir gui/updatefx/site
 mkdir gui/deploy
 
-# create key/wallet
+# create key/wallet. Copy wallet to UpdateProcess or use wallet form other OS build
 java -jar ./updatefx/updatefx-app-1.2.jar --url=http://localhost:8000/ gui/updatefx
 
 # start webserver for update data
-cd /Users/admin_mbp/Dropbox/Bitsquare2/gui/updatefx/site
+# cd gui/updatefx/site
 # python -m SimpleHTTPServer 8000
 
 # create icons
diff --git a/build_setup_win.bat b/build_setup_win.bat
new file mode 100644
index 0000000000..6f58dcf9b3
--- /dev/null
+++ b/build_setup_win.bat
@@ -0,0 +1,14 @@
+:: setup dirs
+mkdir gui\updatefx
+mkdir gui\updatefx\builds
+mkdir gui\updatefx\builds\processed
+mkdir gui\updatefx\site
+mkdir gui\deploy
+
+:: create key/wallet. Copy wallet to UpdateProcess or use wallet form other OS build
+java -jar ./updatefx/updatefx-app-1.2.jar --url=http://localhost:8000/ gui/updatefx
+
+:: start webserver for update data
+:: cd gui\updatefx\site
+:: python -m SimpleHTTPServer 8000
+
diff --git a/build_update.sh b/build_update.sh
index f836701af8..39b2425498 100644
--- a/build_update.sh
+++ b/build_update.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# edit path
-cd /Users/mk/Documents/_intellij/bitsquare_UpdateFX_maven 
 mvn clean package -DskipTests -Dmaven.javadoc.skip=true
 
 # edit version /*.jar
diff --git a/build_update_win.bat b/build_update_win.bat
new file mode 100644
index 0000000000..ea55e729ae
--- /dev/null
+++ b/build_update_win.bat
@@ -0,0 +1,7 @@
+mvn clean package -DskipTests -Dmaven.javadoc.skip=true
+
+:: edit version /*.jar
+cp gui\target\shaded.jar gui\updatefx\builds\2.jar
+
+:: edit url
+java -jar ./updatefx/updatefx-app-1.2.jar --url=http://localhost:8000/ gui/updatefx
\ No newline at end of file