diff --git a/objenesis.spec b/objenesis.spec
index 63f3d13..786fe14 100644
--- a/objenesis.spec
+++ b/objenesis.spec
@@ -31,10 +31,10 @@
 Summary:        A library for instantiating Java objects
 Name:           objenesis
 Version:        1.2
-Release:        14%{dist}
+Release:        15%{dist}
 Group:          Development/Libraries
 License:        ASL 2.0
-URL:            http://objenesis.googlecode.com/svn/docs/index.html
+URL:            http://objenesis.org/
 # svn export http://objenesis.googlecode.com/svn/tags/1_2/ objenesis-1.2
 # tar cfJ objenesis-1.2.tar.xz objenesis-1.2
 Source0:        %{name}-%{version}.tar.xz
@@ -51,27 +51,13 @@ BuildRequires:  jpackage-utils
 BuildRequires:  java-devel
 BuildRequires:  junit
 BuildRequires:  maven-local
-BuildRequires:  maven-antrun-plugin
-BuildRequires:  maven-assembly-plugin
-BuildRequires:  maven-compiler-plugin
-BuildRequires:  maven-install-plugin
-BuildRequires:  maven-jar-plugin
-BuildRequires:  maven-javadoc-plugin
-BuildRequires:  maven-resources-plugin
-BuildRequires:  maven-remote-resources-plugin
-BuildRequires:  maven-site-plugin
 BuildRequires:  maven-shade-plugin
-BuildRequires:  maven-source-plugin
-BuildRequires:  maven-surefire-plugin
 BuildRequires:  maven-license-plugin
 BuildRequires:  maven-timestamp-plugin
 BuildRequires:  xpp3-minimal
-BuildRequires:  asm2
+BuildRequires:  objectweb-asm
 BuildRequires:  apache-resource-bundles
 
-Requires:       java 
-Requires:       jpackage-utils
-
 BuildArch:      noarch
 
 %description
@@ -89,7 +75,7 @@ the constructor is a fairly specialized task, however there are certain cases
 when this is useful:
 * Serialization, Remoting and Persistence - Objects need to be instantiated 
   and restored to a specific state, without invoking code.
-* Proxies, AOP Libraries and Mock Objects - Classes can be subclassed without 
+* Proxies, AOP Libraries and Mock Objects - Classes can be sub-classed without 
   needing to worry about the super() constructor.
 * Container Frameworks - Objects can be dynamically instantiated in 
   non-standard ways.
@@ -98,7 +84,6 @@ when this is useful:
 %package javadoc
 Group:          Documentation
 Summary:        Javadoc for %{name}
-Requires:       jpackage-utils
 BuildArch:      noarch
 
 %description javadoc
@@ -123,10 +108,7 @@ This package contains the API documentation for %{name}.
 
 %build
 # tests are skipped because of missing dependency spring-osgi-test
-mvn-rpmbuild -e \
-          -Dyear=2009 \
-          -Dmaven.test.skip=true \
-          install javadoc:javadoc
+%mvn_build -- -Dyear=2009 -Dmaven.test.skip=true
 
 # Below is for manual (requires xsite), skipped
 #pushd website
@@ -139,37 +121,21 @@ mvn-rpmbuild -e \
 
 
 %install
-# jars
-install -Dp -m 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-parent.pom
-%add_maven_depmap JPP-%{name}-parent.pom
-
-install -Dp -m 644 main/target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-install -Dp -m 644 main/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-install -Dp -m 644 tck/target/%{name}-tck-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tck.jar
-install -Dp -m 644 tck/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-tck.pom
-%add_maven_depmap JPP-%{name}-tck.pom %{name}-tck.jar
-
-# javadoc
-install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}/main
-cp -pr main/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/main
-install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}/tck
-cp -pr tck/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/tck
+%mvn_install
 
 
-%files
+%files -f .mfiles
+%dir %{_javadir}/%{name}
 %doc LICENSE.txt
-%{_javadir}/*.jar
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE.txt
-%{_javadocdir}/%{name}
 
 
 %changelog
+* Sun Sep 08 2013 Mat Booth <fedora@matbooth.co.uk> - 1.2-15
+- Update for latest guidelines, rhbz #992389
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild