diff --git a/.gitignore b/.gitignore
index 9eaea54..cb806f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 maven-verifier-plugin-1.0.tar.gz
+/maven-verifier-plugin-1.0-source-release.zip
diff --git a/maven-verifier-plugin.spec b/maven-verifier-plugin.spec
index f0f3bb0..4725572 100644
--- a/maven-verifier-plugin.spec
+++ b/maven-verifier-plugin.spec
@@ -1,42 +1,19 @@
 Name:           maven-verifier-plugin
 Version:        1.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Maven Verifier Plugin
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-verifier-plugin/
-#svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-verifier-plugin-1.0/
-#tar -zcf maven-verifier-plugin-1.0.tar.gz maven-verifier-plugin-1.0/
-Source0:        %{name}-%{version}.tar.gz
+Source0:        http://www.apache.org/dist/maven/plugins/%{name}-%{version}-source-release.zip
 
 BuildArch: noarch
 
 BuildRequires: java-devel >= 1:1.6.0
 BuildRequires: jpackage-utils
 BuildRequires: maven-local
-BuildRequires: maven-plugin-plugin
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin
-BuildRequires: junit
 BuildRequires: plexus-utils
-BuildRequires: maven-surefire-provider-junit
-
-Requires: maven
-Requires: java
-Requires: jpackage-utils
-Requires: junit
-Requires: plexus-utils
-
-Requires(post):       jpackage-utils
-Requires(postun):     jpackage-utils
-
-Obsoletes: maven2-plugin-verifier <= 0:2.0.8
-Provides: maven2-plugin-verifier = 1:%{version}-%{release}
 
 %description
 Assists in integration testing by means of evaluating 
@@ -45,46 +22,33 @@ success/error conditions read from a configuration file.
 %package javadoc
 Group:          Documentation
 Summary:        Javadoc for %{name}
-Requires:       jpackage-utils
 
 %description javadoc
 API documentation for %{name}.
 
-
 %prep
 %setup -q 
 
+%mvn_file :%{name} %{name}
+
 %build
-mvn-rpmbuild install javadoc:javadoc
+%mvn_build
 
 %install
-# jars
-install -Dpm 644 target/%{name}-%{version}.jar  %{buildroot}%{_javadir}/%{name}.jar
+%mvn_install
 
-%add_to_maven_depmap org.apache.maven.plugins maven-verifier-plugin %{version} JPP maven-verifier-plugin
+%files -f .mfiles
+%doc LICENSE NOTICE DEPENDENCIES
 
-# poms
-install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
-%files
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE NOTICE
 
 %changelog
+* Sat Aug 10 2013 Mat Booth <fedora@matbooth.co.uk> - 1.0-10
+- Fix FTBFS rhbz #992211
+- Update for newer guidelines
+- Install licence files
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 713d0df..1966e6f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4d54c1ac07661b08d9967c6c05e26dbf  maven-verifier-plugin-1.0.tar.gz
+037d7f28d674c7fe1a6696904a213ff2  maven-verifier-plugin-1.0-source-release.zip