diff --git a/bin/DependencyFinder b/bin/DependencyFinder
index 5ae14831..923c1ad8 100755
--- a/bin/DependencyFinder
+++ b/bin/DependencyFinder
@@ -42,4 +42,18 @@ do
 done
 readonly DEPENDENCYFINDER_CLASSPATH="$DEPENDENCYFINDER_CLASSPATH:$CLASSPATH"
 
-$JAVA_HOME/bin/java $DEPENDENCYFINDER_OPTS -classpath "$DEPENDENCYFINDER_CLASSPATH" com.jeantessier.dependencyfinder.gui.$COMMAND $*
+readonly SPACE_REGEX="[[:space:]]"
+
+PARAMS=""
+while [[ $1 ]]
+do
+    if [[ $1 =~ $SPACE_REGEX ]]
+    then
+        PARAMS="${PARAMS} \"$1\""
+    else
+        PARAMS="${PARAMS} $1"
+    fi
+    shift
+done
+
+eval "$JAVA_HOME/bin/java $DEPENDENCYFINDER_OPTS -classpath \"$DEPENDENCYFINDER_CLASSPATH\" com.jeantessier.dependencyfinder.gui.$COMMAND $PARAMS"
diff --git a/bin/OOMetrics b/bin/OOMetrics
index 62478b49..8fa9e75a 100755
--- a/bin/OOMetrics
+++ b/bin/OOMetrics
@@ -42,4 +42,18 @@ do
 done
 readonly DEPENDENCYFINDER_CLASSPATH="$DEPENDENCYFINDER_CLASSPATH:$CLASSPATH"
 
-$JAVA_HOME/bin/java $DEPENDENCYFINDER_OPTS -classpath "$DEPENDENCYFINDER_CLASSPATH" com.jeantessier.dependencyfinder.cli.$COMMAND -default-configuration "$DEPENDENCYFINDER_HOME/etc/MetricsConfig.xml" $*
+readonly SPACE_REGEX="[[:space:]]"
+
+PARAMS=""
+while [[ $1 ]]
+do
+    if [[ $1 =~ $SPACE_REGEX ]]
+    then
+        PARAMS="${PARAMS} \"$1\""
+    else
+        PARAMS="${PARAMS} $1"
+    fi
+    shift
+done
+
+eval "$JAVA_HOME/bin/java $DEPENDENCYFINDER_OPTS -classpath \"$DEPENDENCYFINDER_CLASSPATH\" com.jeantessier.dependencyfinder.cli.$COMMAND -default-configuration \"$DEPENDENCYFINDER_HOME/etc/MetricsConfig.xml\" $PARAMS"
diff --git a/bin/OOMetricsGUI b/bin/OOMetricsGUI
index c2124e88..2b4befa9 100755
--- a/bin/OOMetricsGUI
+++ b/bin/OOMetricsGUI
@@ -42,4 +42,18 @@ do
 done
 readonly DEPENDENCYFINDER_CLASSPATH="$DEPENDENCYFINDER_CLASSPATH:$CLASSPATH"
 
-$JAVA_HOME/bin/java $DEPENDENCYFINDER_OPTS -classpath "$DEPENDENCYFINDER_CLASSPATH" com.jeantessier.dependencyfinder.gui.OOMetrics -default-configuration "$DEPENDENCYFINDER_HOME/etc/MetricsConfig.xml" $*
+readonly SPACE_REGEX="[[:space:]]"
+
+PARAMS=""
+while [[ $1 ]]
+do
+    if [[ $1 =~ $SPACE_REGEX ]]
+    then
+        PARAMS="${PARAMS} \"$1\""
+    else
+        PARAMS="${PARAMS} $1"
+    fi
+    shift
+done
+
+eval "$JAVA_HOME/bin/java $DEPENDENCYFINDER_OPTS -classpath \"$DEPENDENCYFINDER_CLASSPATH\" com.jeantessier.dependencyfinder.gui.OOMetrics -default-configuration \"$DEPENDENCYFINDER_HOME/etc/MetricsConfig.xml\" $PARAMS"
diff --git a/bin/XSLTProcess b/bin/XSLTProcess
index 73ad6032..051369bb 100755
--- a/bin/XSLTProcess
+++ b/bin/XSLTProcess
@@ -42,4 +42,18 @@ do
 done
 readonly DEPENDENCYFINDER_CLASSPATH="$DEPENDENCYFINDER_CLASSPATH:$CLASSPATH"
 
-$JAVA_HOME/bin/java $DEPENDENCYFINDER_OPTS -classpath "$DEPENDENCYFINDER_CLASSPATH" net.sf.saxon.Transform $*
+readonly SPACE_REGEX="[[:space:]]"
+
+PARAMS=""
+while [[ $1 ]]
+do
+    if [[ $1 =~ $SPACE_REGEX ]]
+    then
+        PARAMS="${PARAMS} \"$1\""
+    else
+        PARAMS="${PARAMS} $1"
+    fi
+    shift
+done
+
+eval "$JAVA_HOME/bin/java $DEPENDENCYFINDER_OPTS -classpath \"$DEPENDENCYFINDER_CLASSPATH\" net.sf.saxon.Transform $PARAMS"
diff --git a/bin/sh.cli.template.txt b/bin/sh.cli.template.txt
index f59da04a..dd233e80 100644
--- a/bin/sh.cli.template.txt
+++ b/bin/sh.cli.template.txt
@@ -42,4 +42,18 @@ do
 done
 readonly DEPENDENCYFINDER_CLASSPATH="$DEPENDENCYFINDER_CLASSPATH:$CLASSPATH"
 
-$JAVA_HOME/bin/java $DEPENDENCYFINDER_OPTS -classpath "$DEPENDENCYFINDER_CLASSPATH" com.jeantessier.dependencyfinder.cli.$COMMAND $*
+readonly SPACE_REGEX="[[:space:]]"
+
+PARAMS=""
+while [[ $1 ]]
+do
+    if [[ $1 =~ $SPACE_REGEX ]]
+    then
+        PARAMS="${PARAMS} \"$1\""
+    else
+        PARAMS="${PARAMS} $1"
+    fi
+    shift
+done
+
+eval "$JAVA_HOME/bin/java $DEPENDENCYFINDER_OPTS -classpath \"$DEPENDENCYFINDER_CLASSPATH\" com.jeantessier.dependencyfinder.cli.$COMMAND $PARAMS"