diff --git a/eclipse.spec b/eclipse.spec
index 9d14851..2d664be 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -614,17 +614,17 @@ ln -s %{tomcatlibdir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat
 ln -s %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat/lib/tomcat-coyote.jar
 ln -s %{tomcatlibdir}/server/lib/tomcat-http11.jar plugins/org.eclipse.tomcat/lib/tomcat-http11.jar
 ln -s %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat/lib/tomcat-util.jar
-build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-beanutils
-build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-collections
-build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-dbcp
-build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-digester
-build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-digester-rss
-build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-el
-build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-fileupload
-build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-launcher
-build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-logging
-build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-modeler
-build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-pool
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-beanutils
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-collections
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-dbcp
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-digester
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-digester-rss
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-el
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-fileupload
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-launcher
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-logging
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-modeler
+build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-pool
 build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jspapi
 build-jar-repository -s -p plugins/org.eclipse.tomcat/lib regexp
 build-jar-repository -s -p plugins/org.eclipse.tomcat/lib servletapi5
@@ -1089,17 +1089,17 @@ ln -s %{tomcatlibdir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat
 ln -s %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat_*/lib/tomcat-coyote.jar
 ln -s %{tomcatlibdir}/server/lib/tomcat-http11.jar plugins/org.eclipse.tomcat_*/lib/tomcat-http11.jar
 ln -s %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat_*/lib/tomcat-util.jar
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-beanutils
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-collections
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-dbcp
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-digester
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-digester-rss
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-el
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-fileupload
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-launcher
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-logging
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-modeler
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jakarta-commons-pool
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-beanutils
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-collections
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-dbcp
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-digester
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-digester-rss
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-el
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-fileupload
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-launcher
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-logging-api
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-modeler
+build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-pool
 build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jspapi
 build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib regexp
 build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib servletapi5
@@ -1633,6 +1633,8 @@ fi
 * Wed Jul 05 2006 Andrew Overholt <overholt@redhat.com> 3.2.0-1jpp_1fc
 - Don't require tomcat on ppc64, s390, or s390x until we've got it there.
 - org.eclipse.tomcat -> org.eclipse.tomcat/lib.
+- Update webapp build patch.
+- Use commons-* instead of jakarta-commons-*.
 
 * Tue Jul 04 2006 Ben Konrath <bkonrath@redhat.com> 3.2.0-1jpp_1fc
 - Fix tomcat symlinks.