--- connectors/util/build.xml.orig	2009-07-24 15:36:43.000000000 -0400
+++ connectors/util/build.xml	2009-12-09 10:51:50.000000000 -0500
@@ -40,7 +40,7 @@
     <property name="tomcat-util.lib" value="${tomcat-util.build}/lib" />
     <property name="tomcat-util.jar" value="${tomcat-util.lib}/tomcat-util.jar" />
     <property name="tomcat-loader.jar" value="${tomcat-util.lib}/tomcat-loader.jar" />
-    <property name="tomcat-jni.jar" value="../jni/dist/tomcat-native-1.0.0.jar" />
+    <property name="tomcat-jni.jar" value="../../build/build/server/lib/tomcat-apr.jar" />
 
     <path id="compile.classpath">
         <pathelement location="${jmx.jar}" />
@@ -91,7 +91,10 @@
 	       verbose="off"
 	       excludes="**/CVS/**"
            encoding="ISO-8859-1">
-            <classpath refid="compile.classpath"/>
+            <classpath>
+               <path refid="compile.classpath"/>
+               <pathelement location="${tomcat-util.build}/../../jakarta-tomcat-5/build/classes"/>
+            </classpath>
             <exclude name="**/util/net/jsse/*" unless="jsse.present"/>
             <exclude name="**/util/log/CommonLogHandler.java" unless="commons-logging.present"/>
             <exclude name="**/util/net/puretls/*" unless="puretls.present"/>