diff --git a/pom.xml b/pom.xml
index 801cc16c..ea3513e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,6 +69,31 @@
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.apache.velocity</groupId>
+      <artifactId>velocity</artifactId>
+      <version>1.6.4</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+      <exclusions>
+        <exclusion><groupId>oro</groupId>
+                   <artifactId>oro</artifactId></exclusion>
+        <exclusion><groupId>com.sun.jmx</groupId><artifactId>jmxri</artifactId></exclusion>
+        <exclusion><groupId>oro</groupId><artifactId>oro</artifactId></exclusion>
+        <exclusion><groupId>junit</groupId><artifactId>junit</artifactId></exclusion>
+      </exclusions> 
+    </dependency>
+    <dependency>
+      <groupId>commons-digester</groupId>
+      <artifactId>commons-digester</artifactId>
+      <version>2.0</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+      <exclusions>
+        <exclusion><groupId>commons-beanutils</groupId>
+                   <artifactId>commons-beanutils</artifactId></exclusion>
+      </exclusions> 
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -111,25 +136,10 @@
           <!-- yes, those quoted spaces are a workaround sanctioned by the Maven idiocracy -->
           <compilerArgument>-Xlint" "-Xlint:-serial" "-Xlint:-path</compilerArgument>
           <excludes>
-            <exclude>com/samskivert/velocity/**</exclude>
-            <exclude>com/samskivert/xml/**</exclude>
+            <exclude>com/samskivert/velocity/ImportDirective.java</exclude>
+            <exclude>com/samskivert/velocity/DispatcherServlet.java</exclude>
           </excludes>
         </configuration>
-        <executions>
-          <execution>
-            <id>default-testCompile</id>
-            <phase>test-compile</phase>
-            <configuration>
-              <testExcludes>
-                <exclude>com/samskivert/velocity/**</exclude>
-                <exclude>com/samskivert/xml/**</exclude>
-              </testExcludes>
-            </configuration> 
-            <goals>
-              <goal>testCompile</goal>
-            </goals>
-          </execution>                  
-        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -166,7 +176,6 @@
         <configuration>
           <quiet>true</quiet>
           <show>public</show>
-          <excludePackageNames>com.samskivert.velocity:com.samskivert.xml</excludePackageNames>
           <links>
             <link>http://java.sun.com/products/javamail/javadocs/</link>
             <link>http://download.oracle.com/javaee/1.2.1/api/</link>