diff --git a/client/tomcatconf/classpath.conf.in b/client/tomcatconf/classpath.conf.in
index e14d1470382..ca07103e75b 100644
--- a/client/tomcatconf/classpath.conf.in
+++ b/client/tomcatconf/classpath.conf.in
@@ -4,7 +4,7 @@ SYSTEMJARS="@SYSTEMJARS@"
 SCP=$(build-classpath $SYSTEMJARS 2>/dev/null) ; if [ $? != 0 ] ; then export SCP="@SYSTEMCLASSPATH@" ; fi
 MCP="@MSCLASSPATH@"
 DCP="@DEPSCLASSPATH@"
-CLASSPATH=$SCP:$DCP:$MCP:@MSCONF@
+CLASSPATH=$SCP:$DCP:$MCP:@MSCONF@:@SETUPDATADIR@
 for jarfile in "@PREMIUMJAVADIR@"/* ; do
 	if [ ! -e "$jarfile" ] ; then continue ; fi
 	CLASSPATH=$jarfile:$CLASSPATH