diff --git a/apache-commons-lang.spec b/apache-commons-lang.spec
index 06152a3..3a07bab 100644
--- a/apache-commons-lang.spec
+++ b/apache-commons-lang.spec
@@ -4,7 +4,7 @@
 
 Name:           apache-%{short_name}
 Version:        2.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Provides a host of helper utilities for the java.lang API
 License:        ASL 2.0
 Group:          Development/Libraries
@@ -17,6 +17,7 @@ BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  maven-site-plugin
 BuildRequires:  maven
 BuildRequires:  apache-commons-parent
+BuildRequires:  maven-surefire-provider-junit
 
 Requires:       java >= 1:1.6.0
 Requires:       jpackage-utils >= 0:1.6
@@ -56,56 +57,44 @@ Obsoletes:      jakarta-%{short_name}-javadoc <= 0:2.4
 sed -i 's/\r//' *.txt
 
 %build
-mvn-local install javadoc:javadoc
+mvn-rpmbuild install javadoc:javadoc
 
 %install
 
 # jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -p -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -d -m 755 %{buildroot}%{_javadir}
+install -p -m 644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
 ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
 
 # pom
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{short_name}.pom
-%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
-
-# following line is only for backwards compatibility. New packages
-# should use proper groupid org.apache.commons and also artifactid
-%add_to_maven_depmap %{base_name} %{base_name} %{version} JPP %{short_name}
-
-# Old depmap was wrong and this surfaced as a problem when building
-# other packages
-%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
+%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar -a "org.apache.commons:%{short_name},%{base_name}:%{base_name}"
 
 # javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 
 %pre javadoc
 # workaround for rpm bug, can be removed in F-17
 [ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
 rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 %files
-%defattr(-,root,root,-)
 %doc PROPOSAL.html LICENSE.txt RELEASE-NOTES.txt NOTICE.txt
 %{_javadir}/*
 %{_mavenpomdir}/JPP-%{short_name}.pom
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
 %doc LICENSE.txt NOTICE.txt
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Mon Jun 27 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.6-4
+- Use new add_maven_depmap macro
+- Fix maven3 build
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild