diff --git a/build.xml b/build.xml
index 7b33712a..09920e19 100644
--- a/build.xml
+++ b/build.xml
@@ -61,7 +61,8 @@
       <classpath refid="classpath"/>
       <exclude name="com/samskivert/io/**" unless="build.io"/>
       <exclude name="com/samskivert/jdbc/**" unless="build.jdbc"/>
-      <exclude name="com/samskivert/jdbc/depot/EHCacheAdapter.java" unless="ehcache.present"/>
+      <exclude name="com/samskivert/jdbc/depot/EHCacheAdapter.java" unless="build.depot.ehcache"/>
+      <exclude name="com/samskivert/jdbc/depot/tools/**" unless="build.depot.tools"/>
       <exclude name="com/samskivert/net/MailUtil*" unless="build.mail"/>
       <exclude name="com/samskivert/servlet/**" unless="build.servlet"/>
       <exclude name="com/samskivert/swing/**" unless="build.swing"/>
diff --git a/etc/depends-incl.xml b/etc/depends-incl.xml
index 184d18f8..76e9cc4a 100644
--- a/etc/depends-incl.xml
+++ b/etc/depends-incl.xml
@@ -92,17 +92,17 @@
     </condition>
     <echo level="info">com.samskivert.jdbc: ${build.jdbc}</echo>
 
-    <condition property="build.depot">
+    <condition property="build.depot.ehcache">
       <and>
         <isset property="build.jdbc"/>
         <isset property="ehcache.present"/>
       </and>
     </condition>
-    <echo level="info">com.samskivert.jdbc.depot: ${build.depot}</echo>
+    <echo level="info">com.samskivert.jdbc.depot.ehcace: ${build.depot.ehcache}</echo>
 
     <condition property="build.depot.tools">
       <and>
-        <isset property="build.depot"/>
+        <isset property="build.jdbc"/>
         <isset property="ant.present"/>
       </and>
     </condition>