diff --git a/dist/kobaltw b/dist/kobaltw
index 04ee0773..a8df4bb9 100755
--- a/dist/kobaltw
+++ b/dist/kobaltw
@@ -1,2 +1,2 @@
 #!/usr/bin/env sh
-java -jar $(dirname $0)/../kobalt/wrapper/kobalt-wrapper.jar $*
+java -jar "`dirname "$0"`/../kobalt/wrapper/kobalt-wrapper.jar" $*
\ No newline at end of file
diff --git a/kobaltw b/kobaltw
index 3633f468..b27b3d89 100755
--- a/kobaltw
+++ b/kobaltw
@@ -1,2 +1 @@
-#!/usr/bin/env sh
 java -jar $(dirname $0)/kobalt/wrapper/kobalt-wrapper.jar $*
diff --git a/modules/wrapper/src/main/java/com/beust/kobalt/wrapper/Main.java b/modules/wrapper/src/main/java/com/beust/kobalt/wrapper/Main.java
index 57410961..9df01ca2 100644
--- a/modules/wrapper/src/main/java/com/beust/kobalt/wrapper/Main.java
+++ b/modules/wrapper/src/main/java/com/beust/kobalt/wrapper/Main.java
@@ -285,7 +285,7 @@ public class Main {
         }
 
         String content = "#!" + envPath + " sh\n"
-                + "java -jar $(dirname $0)/kobalt/wrapper/kobalt-wrapper.jar $*\n";
+                + "java -jar \"`dirname \"$0\"`/kobalt/wrapper/kobalt-wrapper.jar\" $*\n";
 
         log(2, "  Generating " + KOBALTW + " with shebang.");