diff --git a/.gitignore b/.gitignore
index 85fba2f..0527861 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ maven-bundle-plugin-2.0.0-project.tar.gz
 /maven-bundle-plugin-2.3.5-source-release.tar.gz
 /maven-bundle-plugin-2.3.6-source-release.tar.gz
 /maven-bundle-plugin-2.3.7-source-release.tar.gz
+/maven-bundle-plugin-2.5.4-source-release.tar.gz
diff --git a/maven-bundle-plugin-dependency.patch b/maven-bundle-plugin-dependency.patch
deleted file mode 100644
index ecb7076..0000000
--- a/maven-bundle-plugin-dependency.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/pom.xml b/pom.xml
-index 16880b5..cd5e6ec 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -65,6 +65,11 @@
-     <version>1.50.0</version>
-   </dependency>
-   <dependency>
-+    <groupId>net.sf.kxml</groupId>
-+    <artifactId>kxml2</artifactId>
-+    <version>2.2.2</version>
-+  </dependency>
-+  <dependency>
-     <groupId>org.apache.felix</groupId>
-     <artifactId>org.apache.felix.bundlerepository</artifactId>
-     <version>1.6.6</version>
diff --git a/maven-bundle-plugin-unbundling.patch b/maven-bundle-plugin-unbundling.patch
deleted file mode 100644
index 2a36f58..0000000
--- a/maven-bundle-plugin-unbundling.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur maven-bundle-plugin-2.3.5.orig/pom.xml maven-bundle-plugin-2.3.5/pom.xml
---- maven-bundle-plugin-2.3.5.orig/pom.xml	2011-07-05 13:56:06.000000000 +0200
-+++ maven-bundle-plugin-2.3.5/pom.xml	2011-10-25 17:29:47.237943990 +0200
-@@ -85,6 +85,11 @@
-    <version>1.2</version>
-   </dependency>
-   <dependency>
-+   <groupId>org.apache.maven.shared</groupId>
-+   <artifactId>maven-osgi</artifactId>
-+   <version>0.3.0</version>
-+  </dependency>
-+  <dependency>
-    <groupId>org.codehaus.plexus</groupId>
-    <artifactId>plexus-utils</artifactId>
-    <version>2.1</version>
diff --git a/maven-bundle-plugin-unreported-exception.patch b/maven-bundle-plugin-unreported-exception.patch
deleted file mode 100644
index 9b6014f..0000000
--- a/maven-bundle-plugin-unreported-exception.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur maven-bundle-plugin-2.3.5.orig/src/main/java/org/apache/felix/obrplugin/RemoteFileManager.java maven-bundle-plugin-2.3.5/src/main/java/org/apache/felix/obrplugin/RemoteFileManager.java
---- maven-bundle-plugin-2.3.5.orig/src/main/java/org/apache/felix/obrplugin/RemoteFileManager.java	2011-07-05 13:56:05.000000000 +0200
-+++ maven-bundle-plugin-2.3.5/src/main/java/org/apache/felix/obrplugin/RemoteFileManager.java	2011-11-14 18:21:26.878801248 +0100
-@@ -125,6 +125,9 @@
-         {
-             throw new MojoExecutionException( "Unable to configure Wagon: '" + repository.getProtocol() + "'", e );
-         }
-+        catch ( Exception e )
-+        {
-+        }
- 
-         try
-         {
diff --git a/maven-plugin-bundle.spec b/maven-plugin-bundle.spec
index 22a5fb0..52f36f6 100644
--- a/maven-plugin-bundle.spec
+++ b/maven-plugin-bundle.spec
@@ -1,8 +1,8 @@
 %global site_name maven-bundle-plugin
 
 Name:           maven-plugin-bundle
-Version:        2.3.7
-Release:        15%{?dist}
+Version:        2.5.4
+Release:        1%{?dist}
 Summary:        Maven Bundle Plugin
 License:        ASL 2.0
 URL:            http://felix.apache.org
@@ -10,20 +10,24 @@ BuildArch:      noarch
 
 Source0:        http://archive.apache.org/dist/felix/%{site_name}-%{version}-source-release.tar.gz
 
-Patch0:         %{site_name}-dependency.patch
-Patch1:         %{site_name}-unreported-exception.patch
-
 BuildRequires:  maven-local
-BuildRequires:  mvn(biz.aQute:bndlib)
+BuildRequires:  mvn(biz.aQute.bnd:biz.aQute.bndlib)
 BuildRequires:  mvn(net.sf.kxml:kxml2)
 BuildRequires:  mvn(org.apache.felix:felix-parent:pom:)
 BuildRequires:  mvn(org.apache.felix:org.apache.felix.bundlerepository)
+BuildRequires:  mvn(org.apache.felix:org.apache.felix.framework)
+BuildRequires:  mvn(org.apache.felix:org.apache.felix.utils)
+BuildRequires:  mvn(org.apache.maven.doxia:doxia-sink-api)
+BuildRequires:  mvn(org.apache.maven.doxia:doxia-site-renderer)
 BuildRequires:  mvn(org.apache.maven:maven-archiver)
 BuildRequires:  mvn(org.apache.maven:maven-core)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
+BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
+BuildRequires:  mvn(org.apache.maven.reporting:maven-reporting-impl)
 BuildRequires:  mvn(org.apache.maven.shared:maven-dependency-tree)
-BuildRequires:  mvn(org.apache.maven.shared:maven-plugin-testing-harness)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
-BuildRequires:  mvn(org.mockito:mockito-all)
+BuildRequires:  mvn(org.osgi:org.osgi.core)
+BuildRequires:  mvn(org.sonatype.plexus:plexus-build-api)
 
 %description
 Provides a maven plugin that supports creating an OSGi bundle
@@ -39,14 +43,18 @@ API documentation for %{name}.
 %prep
 %setup -q -n %{site_name}-%{version}
 
-%patch0 -p1
-%patch1 -p1
+find -name '*.jar' -delete
 
-# remove bundled stuff
-#rm -rf src/main/java/org/apache/maven
+# There is forked version of maven-osgi in
+# src/{main,test}/java/org/apache/maven
+
+%pom_add_dep net.sf.kxml:kxml2
+%pom_add_dep org.apache.felix:org.apache.felix.framework
+%pom_add_dep org.apache.maven.reporting:maven-reporting-impl
 
 %build
-%mvn_build
+# Tests depend on bundled JARs
+%mvn_build -f
 
 %install
 %mvn_install
@@ -58,6 +66,9 @@ API documentation for %{name}.
 %doc LICENSE NOTICE
 
 %changelog
+* Wed Jul 08 2015 Michael Simacek <msimacek@redhat.com> - 2.5.4-1
+- Update to upstream version 2.5.4
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.7-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index 272027a..403231f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1e005fbc3ec00a9c94f6fb665c02d258  maven-bundle-plugin-2.3.7-source-release.tar.gz
+9dc0bf198f8a717b6369dc9fcca05e99  maven-bundle-plugin-2.5.4-source-release.tar.gz