diff --git a/apache-commons-configuration-depmap.xml b/apache-commons-configuration-depmap.xml
new file mode 100644
index 0000000..d52e5ca
--- /dev/null
+++ b/apache-commons-configuration-depmap.xml
@@ -0,0 +1,26 @@
+<dependencies>
+  <dependency>
+    <maven>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+    </maven>
+    <jpp>
+      <groupId>JPP</groupId>
+      <artifactId>tomcat6-servlet-2.5-api</artifactId>
+      <version>6.0.26</version>
+    </jpp>
+  </dependency>
+  <dependency>
+    <maven>
+      <groupId>ant</groupId>
+      <artifactId>ant</artifactId>
+      <version>1.6.5</version>
+    </maven>
+    <jpp>
+      <groupId>JPP</groupId>
+      <artifactId>ant</artifactId>
+      <version>6.0.26</version>
+    </jpp>
+  </dependency>
+</dependencies>
diff --git a/apache-commons-configuration.spec b/apache-commons-configuration.spec
index f19801c..ff09c91 100644
--- a/apache-commons-configuration.spec
+++ b/apache-commons-configuration.spec
@@ -4,13 +4,15 @@
 
 Name:           apache-%{short_name}
 Version:        1.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Commons Configuration Package
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://commons.apache.org/%{base_name}/
 Source0:        http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
+# TODO: make upstream fix ant:ant groupId
+Source1:        %{name}-depmap.xml
 Patch0:         %{short_name}-test-deps.patch
 BuildArch:      noarch
 
@@ -37,24 +39,23 @@ BuildRequires:  apache-commons-codec
 BuildRequires:  apache-commons-lang
 BuildRequires:  apache-commons-logging
 # convert to apache-commons when transition is done
-BuildRequires:  jakarta-commons-collections
+BuildRequires:  apache-commons-collections
 BuildRequires:  jakarta-commons-dbcp
-BuildRequires:  jakarta-commons-digester
-BuildRequires:  jakarta-commons-jxpath
+BuildRequires:  apache-commons-digester
+BuildRequires:  apache-commons-jxpath
 BuildRequires:  jakarta-commons-pool
-# update to tomcat5 servlet APIs when maven is updated
-BuildRequires:  servletapi5
-BuildRequires:  tomcat5
-Requires:  servletapi5
+BuildRequires:  servlet25
+BuildRequires:  tomcat6
 
+Requires:  servlet25
 Requires:  apache-commons-beanutils >= 0:1.7.0
 Requires:  apache-commons-codec
 Requires:  apache-commons-jxpath
 Requires:  apache-commons-lang
 Requires:  apache-commons-logging
-Requires:  jakarta-commons-collections
+Requires:  apache-commons-collections
 Requires:  jakarta-commons-dbcp
-Requires:  jakarta-commons-digester
+Requires:  apache-commons-digester
 Requires:  jakarta-commons-pool
 Requires:  xerces-j2
 Requires:  xml-commons-apis
@@ -103,6 +104,7 @@ mkdir -p $MAVEN_REPO_LOCAL
 
 mvn-jpp -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
         -Dmaven.test.skip=true \
+        -Dmaven2.jpp.depmap.file=%{SOURCE1} \
         install javadoc:javadoc
 
 %install
@@ -157,6 +159,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 14 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.6-3
+- tomcat5 -> tomcat6 BRs/Rs
+- jakarta -> apache BRs/Rs
+
 * Thu Jul  8 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.6-2
 - Add license to javadoc subpackage