diff --git a/SPECS/xmlrpc.spec b/SPECS/xmlrpc.spec
index bb1ae73..bd6cb39 100644
--- a/SPECS/xmlrpc.spec
+++ b/SPECS/xmlrpc.spec
@@ -1,9 +1,10 @@
 %{?scl:%scl_package xmlrpc}
 %{!?scl:%global pkg_name %{name}}
+%{?java_common_find_provides_and_requires}
 
 Name:           %{?scl_prefix}xmlrpc
 Version:        3.1.3
-Release:        8.3%{?dist}
+Release:        8.4%{?dist}
 Epoch:          1
 Summary:        Java XML-RPC implementation
 License:        ASL 2.0
@@ -16,12 +17,12 @@ Patch1:         %{pkg_name}-common-addosgimanifest.patch
 Patch2:         %{pkg_name}-javax-methods.patch
 Patch3:         %{pkg_name}-server-addosgimanifest.patch
 
-BuildRequires:  %{?maven_scl_prefix}maven-local
-BuildRequires:  %{?maven_scl_prefix}mvn(org.apache:apache)
-BuildRequires:  %{?maven_scl_prefix}mvn(commons-httpclient:commons-httpclient)
-BuildRequires:  %{?maven_scl_prefix}mvn(commons-logging:commons-logging)
-BuildRequires:  %{?maven_scl_prefix}mvn(javax.servlet:servlet-api)
-BuildRequires:  %{?scl_prefix}ws-commons-util
+BuildRequires:  %{?scl_prefix_java_common}maven-local
+BuildRequires:  %{?scl_prefix_maven}mvn(org.apache:apache:pom:)
+BuildRequires:  %{?scl_prefix_java_common}mvn(commons-httpclient:commons-httpclient)
+BuildRequires:  %{?scl_prefix_java_common}mvn(commons-logging:commons-logging)
+BuildRequires:  %{?scl_prefix_java_common}mvn(javax.servlet:servlet-api)
+BuildRequires:  %{?scl_prefix_java_common}ws-commons-util
 
 %description
 Apache XML-RPC is a Java implementation of XML-RPC, a popular protocol
@@ -38,7 +39,6 @@ Javadoc for %{name}.
 
 %package common
 Summary:    Common classes for XML-RPC client and server implementations
-Requires:  %{?scl_prefix}ws-commons-util
 
 %description common
 %{summary}.
@@ -70,23 +70,23 @@ popd
 
 sed -i 's/\r//' LICENSE.txt
 
-scl enable %{scl} - <<"EOF"
+%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"}
 %pom_disable_module dist
 %pom_remove_dep jaxme:jaxmeapi common
 %mvn_file :{*} @1
 %mvn_package :*-common %{pkg_name}
-EOF
+%{?scl:EOF}
 
 %build
-scl enable %{scl} - <<"EOF"
+%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"}
 # FIXME: ignore test failure because server part needs network
 %mvn_build -s -- -Dmaven.test.failure.ignore=true
-EOF
+%{?scl:EOF}
 
 %install
-scl enable %{scl} - <<"EOF"
+%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"}
 %mvn_install
-EOF
+%{?scl:EOF}
 
 %files common -f .mfiles-%{pkg_name}
 %doc LICENSE.txt NOTICE.txt
@@ -99,6 +99,9 @@ EOF
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Mon May 11 2015 Mat Booth <mat.booth@redhat.com> - 1:3.1.3-8.4
+- Resolves: rhbz#1219013 - Fails to build from source
+
 * Thu Jul 10 2014 Sami Wagiaalla <swagiaal@redhat.com> - 1:3.1.3-8.3
 - Add OSGi info for xmlrpc-server jar.
 - export o.a.xmlrpc from xmlrpc-client jar.