diff --git a/dbcp-tomcat-build.xml b/dbcp-tomcat-build.xml
deleted file mode 100644
index e69dcb6..0000000
--- a/dbcp-tomcat-build.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<!-- $Id: build.xml,v 1.25 2004/05/20 16:30:30 dirkv Exp $ -->
-<project name="commons-dbcp-tomcat5" default="build" basedir=".">
-
-   <property name="tomcat-dbcp.home" value="dbcp-tomcat5"/>
-   <property name="commons-dbcp.home" value="."/>
-   <property name="tomcat-dbcp.jar" value="commons-dbcp-tomcat5.jar"/>
-
-   <!-- Java Options -->
-   <property name="compile.debug" value="true"/>
-   <property name="compile.deprecation" value="false"/>
-   <property name="compile.source" value="1.5"/>
-
-   <target name="clean">
-     <delete dir="${tomcat-dbcp.home}"/>
-   </target>
-
-<target name="build">
-    <copy todir="${tomcat-dbcp.home}">
-<!--        <fileset dir="${commons-collections.home}" >
-            <include name="**/collections/CursorableLinkedList.java" />
-            <include name="**/collections/KeyValue.java" />
-            <include name="**/collections/LRUMap.java" />
-            <include name="**/collections/SequencedHashMap.java" />
-        </fileset>
-        <fileset dir="${commons-pool.home}">
-            <include name="**/*.java" />
-            <exclude name="**/Stack*.java" />
-            <exclude name="**/SoftReferenceObjectPool.java" />
-            <exclude name="**/test/**" />
-        </fileset> -->
-        <fileset dir="${commons-dbcp.home}">
-            <include name="**/*.java" />
-            <exclude name="**/test/**" />
-            <exclude name="${tomcat-dbcp.home}/**"/>
-        </fileset>
-    </copy>
-    <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons">
-        <replacefilter token="return UnmodifiableList.decorate(l);"
-            value="return l;" />
-        <replacefilter token="import org.apache.commons.collections.list.UnmodifiableList;"
-            value=" " />
-    </replace>
-    <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons" >
-        <replacefilter token="org.apache.commons"
-            value="org.apache.tomcat.dbcp" />
-    </replace>
-    <mkdir dir="${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp" />
-    <move todir="${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp">
-        <fileset dir="${tomcat-dbcp.home}/src/java/org/apache/commons" />
-    </move>
-    <mkdir dir="${tomcat-dbcp.home}/classes"/>
-    <javac target="1.5" destdir="${tomcat-dbcp.home}/classes"
-           optimize="off"
-           debug="${compile.debug}"
-           deprecation="${compile.deprecation}"
-           source="${compile.source}"
-           sourcepath="${tomcat-dbcp.home}/src/java"
-           srcdir="${tomcat-dbcp.home}/src/java" >
-      <include name="**" />
-    </javac>
-    <jar destfile="${tomcat-dbcp.home}/${tomcat-dbcp.jar}"
-         index="true">
-       <fileset dir="${tomcat-dbcp.home}/classes">
-          <include name="**/*.class" />
-          <include name="**/*.properties" />
-       </fileset>
-    </jar>
-  </target>
-
-</project>
-
diff --git a/tomcat.changes b/tomcat.changes
index 8bc558b..3072ad2 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Sep 29 12:26:30 UTC 2016 - tchvatal@suse.com
+
+- Switch to commons-dbcp2 fate#321029
+
 -------------------------------------------------------------------
 Fri Sep  2 13:20:00 UTC 2016 - malbu@suse.com
 
diff --git a/tomcat.spec b/tomcat.spec
index 0bc8f2a..a5bc8a5 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -64,7 +64,6 @@ Source21:       tomcat-functions
 Source30:       tomcat-preamble
 Source31:       tomcat-server
 Source32:       tomcat-named.service
-Source40:       dbcp-tomcat-build.xml
 Source1000:     tomcat-rpmlintrc
 Source1001:     http://www.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz.asc
 Source1002:     %{name}.keyring
@@ -82,6 +81,10 @@ Patch4:         tomcat-7.0-sle.catalina.policy.patch
 Patch5:         tomcat-8.0.36-jar-scanner-loop.patch
 BuildRequires:  ant >= 1.8.1
 BuildRequires:  ant-antlr
+BuildRequires:  apache-commons-collections
+BuildRequires:  apache-commons-daemon
+BuildRequires:  apache-commons-dbcp >= 2.0
+BuildRequires:  apache-commons-pool2
 BuildRequires:  ecj >= 4.4.0
 BuildRequires:  fdupes
 BuildRequires:  findutils
@@ -89,12 +92,6 @@ BuildRequires:  geronimo-jaf-1_0_2-api
 BuildRequires:  geronimo-jaxrpc-1_1-api
 BuildRequires:  geronimo-qname-1_1-api
 BuildRequires:  geronimo-saaj-1_1-api
-BuildRequires:  jakarta-commons-collections
-BuildRequires:  jakarta-commons-daemon
-BuildRequires:  jakarta-commons-dbcp
-BuildRequires:  jakarta-commons-dbcp-src
-BuildRequires:  jakarta-commons-pool
-BuildRequires:  jakarta-commons-pool-tomcat5
 BuildRequires:  jakarta-taglibs-standard >= 1.1
 BuildRequires:  java-devel >= 1.7.0
 BuildRequires:  javapackages-tools
@@ -107,10 +104,10 @@ BuildRequires:  unzip
 BuildRequires:  wsdl4j
 BuildRequires:  zip
 Requires:       %{name}-lib = %{version}-%{release}
-Requires:       jakarta-commons-daemon
-Requires:       jakarta-commons-dbcp
-Requires:       jakarta-commons-logging
-Requires:       jakarta-commons-pool
+Requires:       apache-commons-daemon
+Requires:       apache-commons-dbcp
+Requires:       apache-commons-logging
+Requires:       apache-commons-pool2
 Requires:       log4j
 Requires(post): %fillup_prereq
 Requires(pre):  %{_sbindir}/groupadd
@@ -254,17 +251,6 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
 sed -i -e '/build-date/ d' webapps/docs/tomcat-docs.xsl
 
 %build
-#bnc847505: build all commons-dbcp-tomcat jars before tomcat
-#           so we broke the build cycle between commons-dbcp and tomcat
-
-mkdir -p commons/dbcp
-pushd commons/dbcp
-cp %{SOURCE40} .
-mkdir src
-cp -r %{_usrsrc}/commons-dbcp/java src/
-export CLASSPATH=$(build-classpath commons-pool-tomcat5)
-ant -f dbcp-tomcat-build.xml
-popd
 
 ln -s $(build-classpath jakarta-taglibs-core) webapps/examples/WEB-INF/lib/jstl.jar
 ln -s $(build-classpath jakarta-taglibs-standard) webapps/examples/WEB-INF/lib/standard.jar
@@ -274,7 +260,6 @@ export OPT_JAR_LIST="xalan-j2-serializer"
 export ANT_OPTS=-Xmx500M
 
 # we don't care about the tarballs and we're going to replace
-# tomcat-dbcp.jar with jakarta-commons-{collections,dbcp,pool}-tomcat5.jar
 # so just create a dummy file for later removal
 touch HACK
 mkdir -p HACKDIR
@@ -294,8 +279,8 @@ ant -Dbase.path="." \
     -Dnsis.exe="HACK" \
     -Djaxrpc-lib.jar="$(build-classpath jaxrpc)" \
     -Dwsdl4j-lib.jar="$(build-classpath wsdl4j)" \
-    -Dcommons-pool.home="HACKDIR" \
-    -Dcommons-dbcp.home="HACKDIR" \
+    -Dcommons-pool.home="$(build-classpath commons-pool2)" \
+    -Dcommons-dbcp.home="$(build-classpath commons-dbcp2)" \
     -Dno.build.dbcp=true \
     -Dversion="%{version}" \
     -Dversion.build="%{micro_version}" \
@@ -388,9 +373,6 @@ pushd output/extras
     cp -a *.jar %{buildroot}%{libdir}
 popd
 
-# bnc#847505: add missing tomcat-dbcp.jar
-cp -a commons/dbcp/dbcp-tomcat5/commons-dbcp-tomcat5.jar %{buildroot}/%{libdir}/tomcat-dbcp.jar
-
 # javadoc
 cp -a output/dist/webapps/docs/api/* %{buildroot}%{_javadocdir}/%{name}
 
@@ -443,7 +425,7 @@ popd
 
 pushd output/build
     %{_bindir}/build-jar-repository lib commons-collections \
-                                        commons-dbcp commons-pool ecj 2>&1
+                                        commons-dbcp2 commons-pool2 ecj 2>&1
     # need to use -p here with b-j-r otherwise the examples webapp fails to
     # load with a java.io.IOException
     %{_bindir}/build-jar-repository -p webapps/examples/WEB-INF/lib \
@@ -457,9 +439,8 @@ pushd %{buildroot}%{libdir}
     ln -s ../%{name}-el-%{elspec}-api.jar .
     ln -s $(build-classpath commons-collections) commons-collections.jar
     rm -f commons-dbcp.jar
-    ln -s $(build-classpath commons-dbcp) commons-dbcp.jar
-    ln -s $(build-classpath commons-pool) commons-pool.jar
-    ln -s $(build-classpath commons-pool-tomcat5) commons-pool-tomcat5.jar
+    ln -s $(build-classpath commons-dbcp2) commons-dbcp2.jar
+    ln -s $(build-classpath commons-pool2) commons-pool2.jar
     ln -s $(build-classpath log4j) log4j.jar
     ln -s $(build-classpath ecj) jasper-jdt.jar