--- a/bin/daemon.sh.orig	
+++ a/bin/daemon.sh.orig	
@@ -35,11 +35,6 @@ PROGRAM="`basename $ARG0`"
 while [ ".$1" != . ]
 do
   case "$1" in
-    --java-home )
-        JAVA_HOME="$2"
-        shift; shift;
-        continue
-    ;;
     --catalina-home )
         CATALINA_HOME="$2"
         shift; shift;
@@ -178,7 +173,6 @@ case "$1" in
       shift
       "$JSVC" $* \
       $JSVC_OPTS \
-      -java-home "$JAVA_HOME" \
       -pidfile "$CATALINA_PID" \
       -wait "$SERVICE_START_WAIT_TIME" \
       -nodetach \
@@ -194,7 +188,6 @@ case "$1" in
     ;;
     start   )
       "$JSVC" $JSVC_OPTS \
-      -java-home "$JAVA_HOME" \
       -user $TOMCAT_USER \
       -pidfile "$CATALINA_PID" \
       -wait "$SERVICE_START_WAIT_TIME" \
@@ -221,7 +214,6 @@ case "$1" in
     ;;
     version  )
       "$JSVC" \
-      -java-home "$JAVA_HOME" \
       -pidfile "$CATALINA_PID" \
       -classpath "$CLASSPATH" \
       -errfile "&2" \