diff --git a/releng.control/ant.sh b/releng.control/ant.sh
index 3cdf07c799956cca2aa1988b50da15ac2a3605a3..778663b67b53fa03db47256ce7a68f4c014c262e 100644
--- a/releng.control/ant.sh
+++ b/releng.control/ant.sh
@@ -26,7 +26,7 @@ fi
 # Note: this must be Java 4, for now, for "customizeAccessRules"
 # to work. I'll recompile it for Java 5 eventually, but it causes
 # a problem, and a problem only on PPC machine/VM.
-export JAVA_HOME=${JAVA_4_HOME}
+export JAVA_HOME=${JAVA_5_HOME}
 
 ANT_CMD="${ANT_HOME}/bin/ant"
 exec "$ANT_CMD" "$@"
diff --git a/releng.control/cc.sh b/releng.control/cc.sh
index 4ce09af03846ee66398f05fe7e6481507efe7025..4ae6e5545373c96263d036b54bfac8d25c793746 100644
--- a/releng.control/cc.sh
+++ b/releng.control/cc.sh
@@ -19,10 +19,12 @@ trivialPw="ballad"
 
 rm -fr ./workspace
 
-CCNAME="Webtools"
+CCNAME="Webtools-"
 
 # We want to execute CC itself in Java 5
 export JAVA_HOME=${JAVA_5_HOME}
 
-sh ${CCDIR}/cruisecontrol.sh -configfile ${RELENG_CONTROL}/cc_config.xml -jmxport $jmxport -rmiport $rmiport -webport $webport -user $trivialUserName -password $trivialPw -cchome $CCDIR -ccname ${CCNAME} 1>out.txt 2>err.txt &
+export JETTY_HOME=${CCDIR}
+
+sh ${CCDIR}/cruisecontrol.sh -configfile ${RELENG_CONTROL}/cc_config.xml         -jmxport $jmxport -rmiport $rmiport -webport $webport -user $trivialUserName -password $trivialPw -cchome $CCDIR -ccname ${CCNAME} -webapppath ${CCDIR}/webapps/cruisecontrol -jettyxml ${CCDIR}/etc/jetty.xml -dashboardurl http://wtp.rtp.raleigh.ibm.com:7777/dashboard  1>out.txt 2>err.txt &
 
diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index 36b06b9aa0c4281eb72cecfbf28386c06a8151e9..b95736de8882cd7ce34151a422475e832b173bb2 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -74,8 +74,10 @@
     <plugin
         name="project"
         buildafterfailed="false">
+        <!-- dateformat had to be removed for CC 2.8.0
         <dateformat
             format="yyyy-MM-dd HH:mm '('z')'" />
+         -->
         <log
             dir="${env.LOG_DIR}/${project.name}"
             encoding="ISO-8859-1">