diff --git a/prism/bin/prism b/prism/bin/prism
index 2576ab39..128c0a11 100755
--- a/prism/bin/prism
+++ b/prism/bin/prism
@@ -3,7 +3,7 @@
 # Startup script for PRISM (Linux/Solaris)
 
 # PRISM home directory
-PRISM_DIR=/data/private/luser/tmp/prismtest/prism-2.1.dev11.sim8
+PRISM_DIR=/home/staff/dxp/prism
 
 # Command to launch Java
 if [ "$PRISM_JAVA" = "" ]; then
@@ -37,5 +37,10 @@ if [ "$PRISM_MAINCLASS" = "" ]; then
 	PRISM_MAINCLASS=prism.PrismCL
 fi
 
+# Do we run headless? (GUI overrides this)
+if [ "$PRISM_HEADLESS" = "" ]; then
+	PRISM_HEADLESS=true
+fi
+
 # Run PRISM through Java
-"$PRISM_JAVA" $PRISM_JAVAMAXMEM -Djava.library.path=$PRISM_DIR/lib -classpath "$PRISM_CLASSPATH" $PRISM_MAINCLASS "$@"
+"$PRISM_JAVA" $PRISM_JAVAMAXMEM -Djava.awt.headless=$PRISM_HEADLESS -Djava.library.path=$PRISM_DIR/lib -classpath "$PRISM_CLASSPATH" $PRISM_MAINCLASS "$@"
diff --git a/prism/bin/xprism b/prism/bin/xprism
index 628d846e..d24bc9ac 100755
--- a/prism/bin/xprism
+++ b/prism/bin/xprism
@@ -3,9 +3,10 @@
 # Startup script for PRISM GUI (Linux/Solaris)
 
 # PRISM home directory
-PRISM_DIR=/data/private/luser/tmp/prismtest/prism-2.1.dev11.sim8
+PRISM_DIR=/home/staff/dxp/prism
 
 # Launch using main PRISM script
 PRISM_MAINCLASS=userinterface.GUIPrism
-export PRISM_MAINCLASS
+PRISM_HEADLESS=false
+export PRISM_MAINCLASS PRISM_HEADLESS
 $PRISM_DIR/bin/prism "$@"