diff --git a/bnd.properties b/bnd.properties
new file mode 100644
index 0000000..904f2f7
--- /dev/null
+++ b/bnd.properties
@@ -0,0 +1,4 @@
+Bundle-Name=JDOM 2
+Bundle-SymbolicName=org.jdom2
+Export-Package=*
+Import-Package=org.jaxen.*;resolution:=optional,*
diff --git a/jdom2.spec b/jdom2.spec
index 7d209d9..7785c72 100644
--- a/jdom2.spec
+++ b/jdom2.spec
@@ -1,6 +1,6 @@
 Name:          jdom2
 Version:       2.0.6
-Release:       5%{?dist}
+Release:       6%{?dist}
 Summary:       Java manipulation of XML made easy
 License:       ASL 1.1 or BSD
 URL:           http://www.jdom.org/
@@ -8,6 +8,8 @@ Source0:       https://github.com/hunterhacker/jdom/archive/JDOM-%{version}.tar.
 # originally taken from http://repo1.maven.org/maven2/org/jdom/jdom-contrib/1.1.3/jdom-contrib-1.1.3.pom
 Source1:       jdom-contrib-template.pom
 Source2:       jdom-junit-template.pom
+# Bnd tool configuration
+Source3:       bnd.properties
 # Use system libraries
 # Disable gpg signatures
 # Process contrib and junit pom files
@@ -24,9 +26,9 @@ BuildRequires: jaxen
 BuildRequires: xalan-j2
 BuildRequires: xerces-j2
 BuildRequires: xml-commons-apis
-#BuildRequires: jakarta-oro
 BuildRequires: log4j12
 BuildRequires: objectweb-asm3
+BuildRequires: aqute-bnd
 
 BuildArch:     noarch
 
@@ -53,8 +55,6 @@ find . -name "*.class" -print -delete
 find . -name "*.jar" -print -delete
 
 %patch0 -p0
-#sed -i.asm "s|%{_javadir}/objectweb-asm|%{_javadir}/objectweb-asm3|" build.xml
-#sed -i.log4j "s|log4j.jar|log4j12-1.2.17.jar|" build.xml
 
 cp -p %{SOURCE1} maven/contrib.pom
 cp -p %{SOURCE2} maven/junit.pom
@@ -65,9 +65,13 @@ sed -i 's/\r//' LICENSE.txt README.txt
 sed -i.coverage "s|coverage, jars|jars|" build.xml
 
 %build
-
 ant -Dversion=%{version} -Dj2se.apidoc=%{_javadocdir}/java maven
 
+# Make jar into an OSGi bundle
+bnd wrap --output build/package/jdom-%{version}.bar --properties %{SOURCE3} \
+         --version %{version} build/package/jdom-%{version}.jar
+mv build/package/jdom-%{version}.bar build/package/jdom-%{version}.jar
+
 %install
 %mvn_artifact build/maven/core/%{name}-%{version}.pom build/package/jdom-%{version}.jar
 %mvn_artifact build/maven/core/%{name}-%{version}-contrib.pom build/package/jdom-%{version}-contrib.jar
@@ -75,7 +79,6 @@ ant -Dversion=%{version} -Dj2se.apidoc=%{_javadocdir}/java maven
 %mvn_install -J build/apidocs
 
 %files -f .mfiles
-%dir %{_javadir}/%{name}
 %doc CHANGES.txt COMMITTERS.txt README.txt TODO.txt
 %license LICENSE.txt
 
@@ -83,6 +86,10 @@ ant -Dversion=%{version} -Dj2se.apidoc=%{_javadocdir}/java maven
 %license LICENSE.txt
 
 %changelog
+* Thu Apr 14 2016 Mat Booth <mat.booth@redhat.com> - 2.0.6-6
+- Add OSGi metadata to main jar
+- Fix file listed twice warning
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild