diff --git a/skel_unix/modman-cli.sh b/skel_unix/modman-cli.sh
index a5ad913..437a04f 100644
--- a/skel_unix/modman-cli.sh
+++ b/skel_unix/modman-cli.sh
@@ -7,5 +7,5 @@ else
   maindir=$PWD/$(dirname "$0");
 fi
 
-cd "${maindir}"
-java -jar modman.jar "$@"
+cd "${maindir}";
+java -jar modman.jar "$@";
diff --git a/skel_unix/modman.command b/skel_unix/modman.command
index 8bcf9a8..c430c60 100644
--- a/skel_unix/modman.command
+++ b/skel_unix/modman.command
@@ -25,7 +25,7 @@ if [ ! \( -t 0 -o -S /dev/stdin \) ]; then
 
   if command -v x-terminal-emulator >/dev/null; then
     # Linux.
-    x-terminal-emulator -e "$0";
+    x-terminal-emulator -e "cd \"${maindir}\";\"./${me}\"";
 
   elif command -v osascript >/dev/null; then
     # OSX.
@@ -44,12 +44,12 @@ EOF
 fi
 
 # Finally, the payload.
-cd "${maindir}"
+cd "${maindir}";
 # - - -
-java -jar modman.jar
+java -jar modman.jar;
 # - - -
 
 if [ "${ingui}" = "1" ]; then
-  read -p "Press enter to continue" dummyvar
+  read -p "Press enter to continue" dummyvar;
 fi
 exit;