diff --git a/java/target/env.sh b/java/target/env.sh
index 0958a94583c..f62c7efa636 100644
--- a/java/target/env.sh
+++ b/java/target/env.sh
@@ -1,9 +1,16 @@
 #!/bin/sh
 
+SERVER_NAME=MASTER
+
+MEMORY="1024m"
+
+TELNET_PORT=14885
+SERVER_PORT=8885
+MONGODB_PORT=27017
+EXPEDITION_PORT=2010
+
 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 14631053780..91fc1d5dc10 100755
--- a/java/target/start
+++ b/java/target/start
@@ -7,5 +7,5 @@ scriptdir=`dirname "$0"`
 LIB_DIR=`pwd`/native-libraries
 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 &
+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 -Xmx$MEMORY -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"