diff --git a/pom.xml b/pom.xml
index 22b65ca..3646242 100644
--- a/pom.xml
+++ b/pom.xml
@@ -172,9 +172,10 @@
             <configuration>
               <instructions>
                 <_versionpolicy>$(@)</_versionpolicy>
+                <Export-Package>com.beust.testng,org.testng*</Export-Package>
                 <Import-Package>
+                  com.beust.jcommander.*;version="[1.7.0,3.0.0)",
                   bsh.*;version="[2.0.0,3.0.0)";resolution:=optional,
-                  com.beust.jcommander.*;version="[1.7.0,3.0.0)";resolution:=optional,
                   com.google.inject.*;version="[1.2,1.3)";resolution:=optional,
                   junit.framework;version="[3.8.1, 5.0.0)";resolution:=optional,
                   org.junit.*;resolution:=optional,
diff --git a/testng.spec b/testng.spec
index 0ecf6fd..840c43e 100644
--- a/testng.spec
+++ b/testng.spec
@@ -2,7 +2,7 @@
 
 Name:           testng
 Version:        6.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Java-based testing framework
 License:        ASL 2.0
 URL:            http://testng.org/
@@ -98,6 +98,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 %license LICENSE.txt
 
 %changelog
+* Wed Aug 23 2017 Mat Booth <mat.booth@redhat.com> - 6.12-2
+- Allow OSGi metadata to export all packages including internal ones
+
 * Fri Jul 28 2017 Mat Booth <mat.booth@redhat.com> - 6.12-1
 - Update to latest release of testng
 - Fixes classloading from ant rhbz#1475842