diff --git a/apache-commons-dbcp.spec b/apache-commons-dbcp.spec
index ca85196..50dda54 100644
--- a/apache-commons-dbcp.spec
+++ b/apache-commons-dbcp.spec
@@ -3,27 +3,25 @@
 
 Name:             apache-%{short_name}
 Version:          1.4
-Release:          17%{?dist}
+Release:          18%{?dist}
 Summary:          Apache Commons DataBase Pooling Package
 Group:            Development/Libraries
 License:          ASL 2.0
 URL:              http://commons.apache.org/%{base_name}/
+BuildArch:        noarch
+
 Source0:          http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
 
-# Depmap needed to remove tomcat* deps (needed only for testing)
-# and fix geronimo transaction
-Source1:          %{short_name}.depmap
 Patch0:           jdbc41.patch
-BuildArch:        noarch
 
-BuildRequires:    java-devel
-BuildRequires:    jpackage-utils
-BuildRequires:    apache-commons-parent
-BuildRequires:    apache-commons-pool
-BuildRequires:    geronimo-parent-poms
-BuildRequires:    jta
-BuildRequires:    maven-plugin-cobertura
-BuildRequires:    maven-local
+BuildRequires:  maven-local
+BuildRequires:  mvn(commons-logging:commons-logging)
+BuildRequires:  mvn(commons-pool:commons-pool)
+BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(org.apache.commons:commons-parent:pom:)
+BuildRequires:  mvn(org.apache.geronimo.specs:geronimo-jta_1.1_spec)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-assembly-plugin)
+BuildRequires:  mvn(org.codehaus.mojo:cobertura-maven-plugin)
 
 %description
 Many Apache projects support interaction with a relational database. Creating a
@@ -67,6 +65,10 @@ iconv -f iso8859-1 -t utf-8 RELEASE-NOTES.txt > RELEASE-NOTES.txt.conv && mv -f 
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Wed Mar 25 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-18
+- Remove unused depmap
+- Mavenize build-requires
+
 * Tue Oct 14 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-17
 - Remove legacy Obsoletes/Provides for jakarta-commons
 
diff --git a/commons-dbcp.depmap b/commons-dbcp.depmap
deleted file mode 100644
index b0cfbde..0000000
--- a/commons-dbcp.depmap
+++ /dev/null
@@ -1,20 +0,0 @@
-<dependencies>
-    <dependency>
-        <maven>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-transaction</artifactId>
-        </maven>
-    </dependency>
-    <dependency>
-        <maven>
-            <groupId>tomcat</groupId>
-            <artifactId>naming-java</artifactId>
-        </maven>
-    </dependency>
-    <dependency>
-        <maven>
-            <groupId>tomcat</groupId>
-            <artifactId>naming-common</artifactId>
-        </maven>
-    </dependency>
-</dependencies>
\ No newline at end of file