diff --git a/.gitignore b/.gitignore
index dbf00b1..f2f859f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /.build-*.log
 /org.apache.felix.framework-4.6.0-source-release.tar.gz
 /org.apache.felix.framework-5.0.0-source-release.tar.gz
+/org.apache.felix.framework-5.4.0-source-release.tar.gz
diff --git a/felix-framework.spec b/felix-framework.spec
index 7e0cecb..4ee601e 100644
--- a/felix-framework.spec
+++ b/felix-framework.spec
@@ -1,24 +1,25 @@
 %global bundle org.apache.felix.framework
 
 Name:           felix-framework
-Version:        5.0.0
+Version:        5.4.0
 Release:        1%{?dist}
 Summary:        Apache Felix Framework
 License:        ASL 2.0
 URL:            http://felix.apache.org
 Source0:        http://www.apache.org/dist/felix/%{bundle}-%{version}-source-release.tar.gz
 
-Patch0:         test-ambiguity.patch
-
 BuildArch:      noarch
 
-BuildRequires: maven-local
-BuildRequires: mvn(org.apache.felix:felix-parent:pom:)
-BuildRequires: mvn(org.osgi:org.osgi.annotation)
-BuildRequires: mvn(org.osgi:org.osgi.compendium)
-BuildRequires: mvn(org.osgi:org.osgi.core)
-BuildRequires: mvn(org.mockito:mockito-core)
-BuildRequires: mvn(org.apache.felix:org.apache.felix.resolver) >= 1.2.0
+BuildRequires:  maven-local
+BuildRequires:  mvn(org.apache.felix:felix-parent:pom:)
+BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:  mvn(org.apache.felix:org.apache.felix.resolver) >= 1.8.0
+BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
+BuildRequires:  mvn(org.apache.rat:apache-rat-plugin)
+BuildRequires:  mvn(org.osgi:org.osgi.annotation)
+BuildRequires:  mvn(org.ow2.asm:asm-all)
+BuildRequires:  mvn(org.easymock:easymock)
+BuildRequires:  mvn(org.mockito:mockito-all)
 
 %description
 Apache Felix Framework Interfaces and Classes.
@@ -31,26 +32,27 @@ This package contains the API documentation for %{name}.
 
 %prep
 %setup -q -n %{bundle}-%{version}
-%patch0
 
 # This test needs porting to easymock3
 rm src/test/java/org/apache/felix/framework/ServiceRegistryTest.java
 
-%mvn_file :%{bundle} "felix/%{bundle}"
-
 %build
-%mvn_build -f
+%mvn_build
 
 %install
 %mvn_install
 
 %files -f .mfiles
-%doc LICENSE NOTICE DEPENDENCIES
+%license LICENSE
+%doc NOTICE DEPENDENCIES
 
 %files javadoc -f .mfiles-javadoc
-%doc LICENSE NOTICE
+%license LICENSE
 
 %changelog
+* Sat Nov 28 2015 Mat Booth <mat.booth@redhat.com> - 5.4.0-1
+- Update to 5.4.0 release of framework
+
 * Fri Jun 19 2015 Alexander Kurtakov <akurtako@redhat.com> 5.0.0-1
 - Update to upstream 5.0.
 
diff --git a/sources b/sources
index 45764c8..c95cbca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-78a69ef025622c0de4383601b839cab4  org.apache.felix.framework-5.0.0-source-release.tar.gz
+2ca3b30e6d273b837b8b4e409479a31f  org.apache.felix.framework-5.4.0-source-release.tar.gz