diff --git a/felix-shell.spec b/felix-shell.spec
index 88d004d..5f422e5 100644
--- a/felix-shell.spec
+++ b/felix-shell.spec
@@ -1,15 +1,13 @@
-%global project felix
 %global bundle org.apache.felix.shell
 
-Name:           %{project}-shell
+Name:           felix-shell
 Version:        1.4.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Apache Felix Shell Service
-
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://felix.apache.org
-Source0:        http://archive.apache.org/dist/%{project}/%{bundle}-%{version}-source-release.tar.gz
+Source0:        http://archive.apache.org/dist/felix/%{bundle}-%{version}-source-release.tar.gz
 
 BuildArch: noarch
 
@@ -18,69 +16,45 @@ BuildRequires: jpackage-utils
 BuildRequires: maven-local
 BuildRequires: felix-osgi-core
 BuildRequires: felix-osgi-compendium
-BuildRequires: maven-clean-plugin
-BuildRequires: maven-install-plugin
 BuildRequires: maven-plugin-bundle
 BuildRequires: felix-parent
 BuildRequires: mockito
 
 Requires:       java >= 1:1.6.0
-Requires:       jpackage-utils
-Requires: felix-osgi-core
-Requires: felix-osgi-compendium
-
 
 %description
 A simple OSGi command shell service.
 
 %package javadoc
 Group:          Documentation
-Summary:        Javadoc for %{name}
-Requires:       jpackage-utils
+Summary:        API documentation for %{name}
 
 %description javadoc
-API documentation for %{name}.
-
+This package contains API documentation for %{name}.
 
 %prep
 %setup -q -n %{bundle}-%{version}
 
 %pom_remove_plugin org.codehaus.mojo:rat-maven-plugin
 
+%mvn_file :%{bundle} "felix/%{bundle}"
+
 %build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_build
 
 %install
-# jar
-install -d -m 755 %{buildroot}%{_javadir}/%{project}
-install -Dpm 644 target/%{bundle}-%{version}.jar \
-        %{buildroot}%{_javadir}/%{project}/%{bundle}.jar
-
-# pom
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{project}-%{bundle}.pom
-%add_maven_depmap JPP.%{project}-%{bundle}.pom %{project}/%{bundle}.jar
-
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
- 
-%pre javadoc
-# RPM bug workaround, remove in F20
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
-%files
-%doc LICENSE NOTICE
-%{_javadir}/%{project}/*
-%{_mavenpomdir}/JPP.%{project}-%{bundle}.pom
-%{_mavendepmapfragdir}/*
+%mvn_install
+
+%files -f .mfiles
+%doc LICENSE NOTICE DEPENDENCIES
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE NOTICE
-%{_javadocdir}/%{name}
 
 %changelog
+* Mon Aug 05 2013 Mat Booth <fedora@matbooth.co.uk> - 1.4.3-4
+- Update for latest guidelines
+
 * Sun Aug 04 2013 Mat Booth <fedora@matbooth.co.uk> - 1.4.3-3
 - Add missing BRs