--- /etc/init.d/tomcat-6.orig   2011-03-04 14:59:04.000000000 +0100
+++ /etc/init.d/tomcat-6        2011-03-04 17:29:03.000000000 +0100
@@ -24,8 +24,10 @@
         fi

         # Populate the classpath
-        unset CLASSPATH
-        CLASSPATH="${CATALINA_HOME}/lib:${JAVA_HOME}/lib/tools.jar"
+        # 2011-03 removed unset of CLASSPATH to allow configuration in
+        #         conf.d/tomcat-6
+#       unset CLASSPATH
+        CLASSPATH="${CATALINA_HOME}/lib:${JAVA_HOME}/lib/tools.jar:${CLASSPATH}"
         if [ -n "${JSSE_HOME}" ]; then
                 CLASSPATH="${CLASSPATH}:${JSSE_HOME}/lib/jcert.jar:${JSSE_HOME}/lib/jnet.jar:${JSSE_HOME}/lib/jsse.jar"
         fi