diff --git a/avalon-logkit.spec b/avalon-logkit.spec
index 1062b5a..0ab1b5f 100644
--- a/avalon-logkit.spec
+++ b/avalon-logkit.spec
@@ -33,7 +33,7 @@
 
 Name:        avalon-%{short_name}
 Version:     2.1
-Release:     3%{?dist}
+Release:     4%{?dist}
 Epoch:       0
 Summary:     Java logging toolkit
 License:     ASL 1.1
@@ -56,6 +56,8 @@ BuildRequires:    javamail
 BuildRequires:    ant-junit
 BuildRequires:    log4j
 BuildRequires:    avalon-framework >= 0:4.1.4
+# Required for converting jars to OSGi bundles
+BuildRequires:    aqute-bndlib
 BuildRequires:    servlet25
 BuildRequires:    jms
 BuildRequires:    jdbc-stdext
@@ -86,13 +88,15 @@ find . -name "*.jar" -exec rm -f {} \;
 %build
 export CLASSPATH=%(build-classpath log4j javamail/mailapi jms tomcat6-servlet-2.5-api jdbc-stdext avalon-framework junit):$PWD/build/classes
 ant -Dnoget=true clean jar javadoc
+# Convert to OSGi bundle
+java -jar %{_javadir}/aqute-bndlib.jar 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}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -m 644 target/%{name}-%{version}.bar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
 %add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
@@ -130,6 +134,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue May 3 2011 Severin Gehwolf <sgehwolf@redhat.com> 0:2.1-4
+- Convert jar's to OSGi bundles using aqute-bndlib.
+
 * Thu Apr 21 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:2.1-3
 - Add maven metadata into package
 - Tweaks according to new guidelines