diff --git a/project.clj b/project.clj
index 7f111c9..4f2ce53 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject lein-bin "0.3.4"
+(defproject lein-bin "0.3.6-SNAPSHOT"
   :description "A leiningen plugin for generating standalone console executables for your project."
   :url "https://github.com/Raynes/lein-bin"
   :license {:name "Eclipse Public License"
diff --git a/src/leiningen/bin.clj b/src/leiningen/bin.clj
index 93faf09..4bba4aa 100644
--- a/src/leiningen/bin.clj
+++ b/src/leiningen/bin.clj
@@ -13,14 +13,15 @@
     (join " " (distinct (conj jvm-opts client-opt (format "-D%s.version=%s" name version))))))
 
 (defn jar-preamble [flags]
-  (format (str ":;exec java %s -jar $0 \"$@\"\n"
-               "@echo off\r\njava %s -jar %%1 \"%%~f0\" %%*\r\ngoto :eof\r\n")
+  (format (str ":;exec java %s -jar \"$0\" \"$@\"\n"
+               "@java %s -jar \"%%~f0\" %%*\r\n"
+               "@goto :eof\r\n")
           flags flags))
 
 (defn boot-preamble [flags main]
-  (format (str ":;exec java %s -Xbootclasspath/a:$0 %s \"$@\"\n"
-               "@echo off\r\njava %s -Xbootclasspath/a:%%1 %s "
-               "\"%%~f0\" %%*\r\ngoto :eof\r\n")
+  (format (str ":;exec java %s -Xbootclasspath/a:\"$0\" %s \"$@\"\n"
+               "@java %s -Xbootclasspath/a:\"%%~f0\" %s %%*\r\n"
+               "@goto :eof\r\n")
           flags main flags main))
 
 (defn write-jar-preamble! [out flags]