diff --git a/avalon-logkit.spec b/avalon-logkit.spec
index 20a1943..7f526e0 100644
--- a/avalon-logkit.spec
+++ b/avalon-logkit.spec
@@ -33,7 +33,7 @@
 
 Name:        avalon-%{short_name}
 Version:     2.1
-Release:     21%{?dist}
+Release:     22%{?dist}
 Epoch:       0
 Summary:     Java logging toolkit
 License:     ASL 2.0
@@ -95,14 +95,14 @@ rm -rf src/java/org/apache/log/output/lf5
 export CLASSPATH=$(build-classpath log4j javamail/mailapi jms glassfish-servlet-api jdbc-stdext avalon-framework junit):$PWD/build/classes
 ant -Dencoding=ISO-8859-1 -Dnoget=true clean jar javadoc
 # Convert to OSGi bundle
-java -jar $(build-classpath aqute-bnd) wrap target/%{name}-%{version}.jar
+bnd wrap target/%{name}-%{version}.jar
 
 %install
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 install -d -m 755 $RPM_BUILD_ROOT/%{_mavenpomdir}
 
-install -m 644 target/%{name}-%{version}.bar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -m 644 %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
 %add_maven_depmap JPP-%{name}.pom %{name}.jar -a "%{short_name}:%{short_name},org.apache.avalon.logkit:%{name}"
@@ -119,6 +119,9 @@ cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Jul 16 2015 Michael Simacek <msimacek@redhat.com> - 0:2.1-22
+- Build against aqute-bnd-2.4.1
+
 * Tue Jul 14 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.1-21
 - Add build-requires on javapackages-local