diff --git a/java/target/env.sh b/java/target/env.sh
new file mode 100644
index 00000000000..0958a94583c
--- /dev/null
+++ b/java/target/env.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [[ "$JAVA_HOME" == "" ]]; then
+    JAVA_HOME=$HOME/jdk1.7.0_02
+    echo "Setting JAVA_HOME to $JAVA_HOME"
+fi
+
+TELNET_PORT=14885
+SERVER_NAME=MASTER
diff --git a/java/target/start b/java/target/start
index 4fbd25e30e7..14631053780 100755
--- a/java/target/start
+++ b/java/target/start
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-export TELNET_PORT=14886
-export SERVER_NAME=MASTER
+# source variables
+. `pwd`/env.sh
 
-export JAVA_HOME=/home/trac/jdk1.7.0_02
 scriptdir=`dirname "$0"`
 LIB_DIR=`pwd`/native-libraries
-echo scriptdir is $scriptdir and LIB_DIR is $LIB_DIR
+echo Script directory is $scriptdir and LIB_DIR is $LIB_DIR
+
 nohup "$JAVA_HOME/bin/java" -XX:+UseMembar -D$SERVER_NAME -Dcom.sap.sailing.server.name=$SERVER_NAME -Djava.io.tmpdir=`pwd`/tmp -Dfile.encoding=cp1252 -Djetty.home=$scriptdir/configuration/jetty -Djava.util.logging.config.file=$scriptdir/configuration/logging.properties -Djava.library.path=$LIB_DIR -Xmx8192m -jar plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar -console $TELNET_PORT -configuration ./ -clean &
 echo "Started $SERVER_NAME on port $TELNET_PORT - use telnet localhost $TELNET_PORT to connect to the OSGi console"
diff --git a/java/target/stop b/java/target/stop
index 88f02ba7948..b3dbb3b83c0 100755
--- a/java/target/stop
+++ b/java/target/stop
@@ -1,13 +1,14 @@
 #!/bin/bash
 
-OSGI_TELNET_PORT=14886
-TELNET_ACTIVE=`netstat -tlnp 2>/dev/null | grep ":$OSGI_TELNET_PORT"`
-if [[ $OSGI_TELNET_PORT == "" ]] || [[ $TELNET_ACTIVE == "" ]]; then
-        echo "Could not find server on telnet port $OSGI_TELNET_PORT. Perhaps server is not running?"
+. `pwd`/env.sh
+
+TELNET_ACTIVE=`netstat -tlnp 2>/dev/null | grep ":$TELNET_PORT"`
+if [[ $TELNET_PORT == "" ]] || [[ $TELNET_ACTIVE == "" ]]; then
+        echo "Could not find server on telnet port $TELNET_PORT. Perhaps server is not running?"
         exit
 fi
 
-NC_CMD="nc -t 127.0.0.1 $OSGI_TELNET_PORT"
+NC_CMD="nc -t 127.0.0.1 $TELNET_PORT"
 echo -n exit | $NC_CMD > /dev/null
 
-echo "Stopped server MASTER"
+echo "Stopped server $SERVER_NAME"