diff --git a/apache-commons-modeler.spec b/apache-commons-modeler.spec
index ca39fb5..02e457c 100644
--- a/apache-commons-modeler.spec
+++ b/apache-commons-modeler.spec
@@ -3,9 +3,8 @@
 
 Name:             apache-%{short_name}
 Version:          2.0.1
-Release:          12%{?dist}
+Release:          13%{?dist}
 Summary:          Model MBeans utility classes
-Group:            Development/Libraries
 License:          ASL 2.0
 URL:              http://commons.apache.org/%{base_name}/
 Source0:          http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
@@ -21,16 +20,11 @@ BuildRequires:    apache-commons-digester
 BuildRequires:    apache-commons-logging
 BuildRequires:    maven-local
 
-Requires:         java >= 1:1.6.0
-Requires:         jpackage-utils
-Requires:         apache-commons-beanutils
-Requires:         apache-commons-digester
-Requires:         apache-commons-logging
 
 %description
-Commons Modeler makes the process of setting up JMX (Java Management 
-Extensions) MBeans easier by configuring the required meta data using an XML 
-descriptor. In addition, Modeler provides a factory mechanism to create the 
+Commons Modeler makes the process of setting up JMX (Java Management
+Extensions) MBeans easier by configuring the required meta data using an XML
+descriptor. In addition, Modeler provides a factory mechanism to create the
 actual Model MBean instances.
 
 %package javadoc
@@ -57,35 +51,25 @@ cp -p %{SOURCE1} .
 %pom_remove_dep ant:ant
 %pom_add_dep org.apache.ant:ant:1.8
 
+%mvn_alias : org.apache.commons:%{short_name}
+%mvn_file : %{name} %{short_name}
+
 %build
-mvn-rpmbuild install javadoc:aggregate -Dproject.build.sourceEncoding=UTF-8
+%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
 
 %install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}
-install -pm 644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-(cd %{buildroot}%{_javadir} && for jar in *; do ln -sf ${jar} `echo $jar| sed  "s|apache-||g"`; done)
-
-# pom
-install -d -m 0755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap -a "org.apache.commons:%{short_name}" JPP-%{name}.pom %{name}.jar
+%mvn_install
 
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
-
-%files
+%files -f .mfiles
 %doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE.txt NOTICE.txt
-%{_javadocdir}/%{name}
 
 %changelog
+* Thu Aug  8 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.0.1-13
+- Update to latest packaging guidelines
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.1-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -108,4 +92,3 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
 
 * Sat Oct 2 2010 Chris Spike <chris.spike@arcor.de> 2.0.1-6
 - Rename and rebase from jakarta-commons-modeler
-