diff --git a/apache-commons-lang3.spec b/apache-commons-lang3.spec
index 0169695..fdc7e4b 100644
--- a/apache-commons-lang3.spec
+++ b/apache-commons-lang3.spec
@@ -1,37 +1,23 @@
-
 %global base_name       lang
 %global short_name      commons-%{base_name}3
 
 Name:           apache-%{short_name}
 Version:        3.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Provides a host of helper utilities for the java.lang API
 License:        ASL 2.0
-Group:          Development/Libraries
 URL:            http://commons.apache.org/%{base_name}
 Source0:        http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
 BuildArch:      noarch
 
-BuildRequires:  java-devel >= 1:1.6.0
-BuildRequires:  jpackage-utils >= 0:1.7.2
-BuildRequires:  maven-site-plugin
 BuildRequires:  maven-local
-BuildRequires:  apache-commons-parent
-BuildRequires:  apache-commons-io
-BuildRequires:  junit4
+BuildRequires:  mvn(commons-io:commons-io)
+BuildRequires:  mvn(org.apache.commons:commons-parent)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-assembly-plugin)
 %if 0%{?rhel} <= 0
-BuildRequires:  easymock3
+BuildRequires:  mvn(org.easymock:easymock)
 %endif
 
-BuildRequires:  maven-antrun-plugin
-BuildRequires:  maven-plugin-bundle
-BuildRequires:  maven-resources-plugin
-BuildRequires:  maven-surefire-provider-junit4
-
-Requires:       java >= 1:1.6.0
-Requires:       jpackage-utils >= 0:1.6
-
-
 %description
 The standard Java libraries fail to provide enough methods for
 manipulation of its core classes. The Commons Lang Component provides
@@ -51,50 +37,31 @@ package.
 
 %package        javadoc
 Summary:        API documentation for %{name}
-Group:          Documentation
-Requires:       jpackage-utils
 
 %description    javadoc
 %{summary}.
 
 %prep
 %setup -q -n %{short_name}-%{version}-src
+%mvn_file : %{name} %{short_name}
 
 %build
-mvn-rpmbuild \
-%if 0%{?rhel}
-    -Dmaven.test.skip=true \
-%endif
-    install javadoc:aggregate
+%mvn_build %{?rhel:-f}
 
 %install
+%mvn_install
 
-# jars
-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 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-# javadoc
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
+%files -f .mfiles
 %doc LICENSE.txt RELEASE-NOTES.txt NOTICE.txt
-%{_javadir}/%{name}.jar
-%{_javadir}/%{short_name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE.txt NOTICE.txt
-%doc %{_javadocdir}/%{name}
 
 %changelog
+* Wed May 29 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1-6
+- Build with xmvn
+- Update to current packaging guidelines
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild