diff --git a/build.xml b/build.xml
index 85418f7..fe3d85b 100644
--- a/build.xml
+++ b/build.xml
@@ -1170,7 +1170,8 @@
         <include name="LICENSE.dom-*.txt"/>
       </metainf>
       <fileset dir="${location}">
-        <include name="org/w3c/**.${extension}"/>
+        <include name="org/w3c/dom/*.${extension}"/>
+        <include name="org/w3c/dom/events/*.${extension}"/>
       </fileset>
     </jar>
   </target>
diff --git a/builddeps.sh b/builddeps.sh
index 29d1b15..4517934 100755
--- a/builddeps.sh
+++ b/builddeps.sh
@@ -5,17 +5,17 @@
 # NOTE: Before running the script run "ant jars maven-artifacts".
 rm -rf checkdeps
 mkdir checkdeps
-ls -l batik-svn-trunk/maven/batik-*/*/*.jar | awk '{printf("cp %s checkdeps/\n", $9)}' > cp.sh
+ls -l batik-1.8/maven/batik-*/*/*.jar | grep -v sources | awk '{printf("cp %s checkdeps/\n", $9)}' > cp.sh
 chmod +x cp.sh
 ./cp.sh
 cp lib/*.jar checkdeps
 rm cp.sh
 cd checkdeps
 jdeps -dotoutput dot -classpath . *
-grep batik dot/batik* | grep jar | grep -v 'java\.' | grep -v javax | grep -v xml-apis | grep -v xalan | grep -v JDK | grep -v Path | grep -v '{' | awk '{print $1 " -> " $5}' | sort -u | sed s/'dot\/'/'"'/g | sed s/'.dot:'/'"'/g | sed s/'('/'"'/g | sed s/')"'/'"'/g  > deps.dot
+grep batik dot/batik* | grep jar | grep -v 'not found' | grep -v 'java\.' | grep -v javax | grep -v xml-apis | grep -v xalan | grep -v JDK | grep -v Path | grep -v '{' | awk '{print $1 " -> " $5}' | sort -u | sed s/'dot\/'/'"'/g | sed s/'.dot:'/'"'/g | sed s/'('/'"'/g | sed s/')"'/'"'/g  > deps.dot
 echo 'digraph "batik-jars-deps" {' > batikdeps.dot
-cat deps.dot >> batikdeps.dot
+awk '{if ($1";" != $3) {print $0}}' deps.dot >> batikdeps.dot
 echo '}' >> batikdeps.dot
-sed s/-svn-trunk//g batikdeps.dot | sed s/'.jar'//g > batikdeps-2.dot
+sed s/-1.8//g batikdeps.dot | sed s/'.jar'//g > batikdeps-2.dot
 dot -Tsvg batikdeps-2.dot -o batik-jars-deps.svg
 rm deps.dot batikdeps.dot batikdeps-2.dot
diff --git a/buildpom.sh b/buildpom.sh
index fd00ba3..b6b9dce 100755
--- a/buildpom.sh
+++ b/buildpom.sh
@@ -155,7 +155,7 @@
   </organization>
 
   <dependencies>'
-grep jar checkdeps/dot/$1-svn-trunk.jar.dot | grep -v java | grep org.apache.batik | awk '{print $4}' | sort -u | sed s/xalan-2.7.0/xalan/g | sed s/-1.3.04//g | sed s/'-svn-trunk.jar)";'//g | sed s/'.jar)";'//g | sed s/'('//g | awk '{version = "@version@"; groupId = "org.apache.xmlgraphics"; if ($1 == "xml-apis" || $1 == "xml-apis-ext") {version = "1.3.04"; groupId = "xml-apis"} else if ($1 == "xmlgraphics-commons") {version = "@xgcVersion@"} else if ($1 == "xalan") {version = "2.7.0"; groupId = "xalan";}; printf("    <dependency>\n      <groupId>%s</groupId>\n      <artifactId>%s</artifactId>\n      <version>%s</version>\n    </dependency>\n", groupId, $1, version);}'
+grep jar checkdeps/dot/$1-1.8.jar.dot | grep -v java | egrep 'org.apache.batik|org.w3c.dom' | awk '{print $4}' | sort -u | sed s/xalan-2.7.0/xalan/g | sed s/-1.3.04//g | sed s/'-1.8.jar)";'//g | sed s/'.jar)";'//g | sed s/'('//g | grep -v $1 | awk '{version = "@version@"; groupId = "org.apache.xmlgraphics"; if ($1 == "xml-apis" || $1 == "xml-apis-ext") {version = "1.3.04"; groupId = "xml-apis"} else if ($1 == "xmlgraphics-commons") {version = "@xgcVersion@"} else if ($1 == "xalan") {version = "2.7.0"; groupId = "xalan";}; printf("    <dependency>\n      <groupId>%s</groupId>\n      <artifactId>%s</artifactId>\n      <version>%s</version>\n    </dependency>\n", groupId, $1, version);}'
 echo '  </dependencies>
 </project>'
 
diff --git a/buildpoms.sh b/buildpoms.sh
index 1ee98ba..76f3e51 100755
--- a/buildpoms.sh
+++ b/buildpoms.sh
@@ -6,7 +6,7 @@
 ./builddeps.sh
 rm -rf checkpoms
 mkdir checkpoms
-ls -l checkdeps/dot/batik-* | grep -v js | sed s/'checkdeps\/dot\/'//g | sed s/-svn-trunk.jar.dot//g | awk '{printf("./buildpom.sh %s > checkpoms/%s.pom.template\n", $9, $9)}' > generate-poms.sh
+ls -l checkdeps/dot/batik-* | grep -v js | sed s/'checkdeps\/dot\/'//g | sed s/-1.8.jar.dot//g | awk '{printf("./buildpom.sh %s > checkpoms/%s.pom.template\n", $9, $9)}' > generate-poms.sh
 chmod +x generate-poms.sh
 ./generate-poms.sh
 rm generate-poms.sh
diff --git a/sources/batik-codec.pom.template b/sources/batik-codec.pom.template
index 802f4ee..afbbb40 100644
--- a/sources/batik-codec.pom.template
+++ b/sources/batik-codec.pom.template
@@ -92,10 +92,5 @@
       <artifactId>batik-util</artifactId>
       <version>@version@</version>
     </dependency>
-    <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      <version>1.3.04</version>
-    </dependency>
   </dependencies>
 </project>
diff --git a/sources/batik-ext.pom.template b/sources/batik-ext.pom.template
index 6f43e00..fad47aa 100644
--- a/sources/batik-ext.pom.template
+++ b/sources/batik-ext.pom.template
@@ -72,5 +72,10 @@
   </organization>
 
   <dependencies>
+    <dependency>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
+      <version>1.3.04</version>
+    </dependency>
   </dependencies>
 </project>
diff --git a/sources/batik-parser.pom.template b/sources/batik-parser.pom.template
index 2e7fe45..9c7bc1c 100644
--- a/sources/batik-parser.pom.template
+++ b/sources/batik-parser.pom.template
@@ -92,10 +92,5 @@
       <artifactId>xml-apis</artifactId>
       <version>1.3.04</version>
     </dependency>
-    <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis-ext</artifactId>
-      <version>1.3.04</version>
-    </dependency>
   </dependencies>
 </project>