diff --git a/SPECS/apache-commons-fileupload.spec b/SPECS/apache-commons-fileupload.spec
index ad00f04..c3f8d89 100644
--- a/SPECS/apache-commons-fileupload.spec
+++ b/SPECS/apache-commons-fileupload.spec
@@ -4,6 +4,9 @@
 %{?scl:%scl_package apache-%{short_name}}
 %{!?scl:%global pkg_name %{name}}
 
+# Use java common's requires/provides generator
+%{?java_common_find_provides_and_requires}
+
 # Exclude generation of osgi() style provides, since they are not
 # SCL-namespaced and may conflict with base RHEL packages.
 # See: https://bugzilla.redhat.com/show_bug.cgi?id=1045442
@@ -15,7 +18,7 @@ Version:          1.3
 # 60.X where X is an increasing int. 60 for rhel-6. We use
 # 70.X for rhel-7. For some reason we cannot rely on the
 # dist tag.
-Release:          70.1%{?dist}
+Release:          70.3%{?dist}
 Summary:          This package provides an api to work with html file upload
 License:          ASL 2.0
 Group:            Development/Libraries
@@ -28,28 +31,26 @@ Patch1:           CVE-2013-2186-commons-fileupload.patch
 Patch2:           %{pkg_name}-CVE-2014-0050.patch
 
 BuildRequires:    java-devel >= 1:1.6.0
-BuildRequires:    maven-local
-BuildRequires:    junit >= 0:3.8.1
-BuildRequires:    servlet
-BuildRequires:    apache-commons-io
-BuildRequires:    maven-antrun-plugin
-BuildRequires:    maven-assembly-plugin
-BuildRequires:    maven-compiler-plugin
-BuildRequires:    maven-doxia-sitetools
-BuildRequires:    maven-install-plugin
-BuildRequires:    maven-jar-plugin
-BuildRequires:    maven-javadoc-plugin
-BuildRequires:    maven-plugin-bundle
-BuildRequires:    maven-release-plugin
-BuildRequires:    maven-resources-plugin
-BuildRequires:    buildnumber-maven-plugin
+BuildRequires:    %{?scl_prefix_java_common}maven-local
+BuildRequires:    %{?scl_prefix_java_common}junit >= 0:3.8.1
+BuildRequires:    %{?scl_prefix_java_common}mvn(javax.servlet:servlet-api)
+BuildRequires:    %{?scl_prefix_java_common}apache-commons-io
+BuildRequires:    %{?scl_prefix_maven}maven-antrun-plugin
+BuildRequires:    %{?scl_prefix_maven}maven-assembly-plugin
+BuildRequires:    %{?scl_prefix_maven}maven-compiler-plugin
+BuildRequires:    %{?scl_prefix_maven}maven-doxia-sitetools
+BuildRequires:    %{?scl_prefix_maven}maven-install-plugin
+BuildRequires:    %{?scl_prefix_maven}maven-jar-plugin
+BuildRequires:    %{?scl_prefix_maven}maven-javadoc-plugin
+BuildRequires:    %{?scl_prefix_maven}maven-plugin-bundle
+BuildRequires:    %{?scl_prefix_maven}maven-release-plugin
+BuildRequires:    %{?scl_prefix_maven}maven-resources-plugin
+BuildRequires:    %{?scl_prefix_maven}buildnumber-maven-plugin
 %if 0%{?fedora}
 BuildRequires:    portlet-2.0-api
 %endif
 
 Requires:         java >= 1:1.6.0
-Requires:         jpackage-utils
-Requires:         apache-commons-io
 %if 0%{?fedora}
 Requires:         portlet-2.0-api
 %endif
@@ -74,7 +75,7 @@ This package contains the API documentation for %{name}.
 # -----------------------------------------------------------------------------
 
 %prep
-%{?scl:scl enable %{scl} - << "EOF"}
+%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"}
 %setup -q -n %{short_name}-%{version}-src
 %patch2 -p1
 sed -i 's/\r//' LICENSE.txt
@@ -97,14 +98,14 @@ popd
 %{?scl:EOF}
 
 %build
-%{?scl:scl enable %{scl} - << "EOF"}
+%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"}
 # fix build with generics support
 # tests fail to compile because they use an obsolete version of servlet API (2.4)
 %mvn_build -f
 %{?scl:EOF}
 
 %install
-%{?scl:scl enable %{scl} - << "EOF"}
+%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"}
 %mvn_install
 %{?scl:EOF}
 
@@ -114,6 +115,14 @@ popd
 %files javadoc -f .mfiles-javadoc
 
 %changelog
+* Mon Jan 19 2015 Severin Gehwolf <sgehwolf@redhat.com> 1.3-70.3
+- Require java common's libs for building instead of maven's
+  collection libs.
+
+* Thu Dec 18 2014 Severin Gehwolf <sgehwolf@redhat.com> 1.3-70.2
+- Use maven30 collection for building.
+- Use java common's requires/provides generators.
+
 * Mon Jun 23 2014 Severin Gehwolf <sgehwolf@redhat.com> 1.3-70.1
 - Add requires for thermostat1-runtime package.