diff --git a/build.xml b/build.xml
index 90d1cdc06..7e7db88fa 100644
--- a/build.xml
+++ b/build.xml
@@ -1595,7 +1595,7 @@ under the License.
 
     <target name="osgi" depends="mvn-install">
        <echo message="Building OSGi bundle via Maven" />
-       <mvn:mvn pom="osgi/build.xml">
+       <mvn:mvn pom="osgi/pom.xml">
           <arg value="-Dpoi.version=${version.id}" />
           <arg value="install" />
        </mvn:mvn>
diff --git a/osgi/pom.xml b/osgi/pom.xml
index 9b33aa84f..2849467a9 100644
--- a/osgi/pom.xml
+++ b/osgi/pom.xml
@@ -37,6 +37,10 @@
   </description>
   <url>http://poi.apache.org/</url>
   <version>${poi.version}</version>
+<!--
+  <version>3.12-beta2</version>
+  <version>@VERSION@</version>
+-->
 
   <properties>
     <maven.compiler.source>1.6</maven.compiler.source>
@@ -107,7 +111,7 @@
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.core</artifactId>
       <version>5.0.0</version>
-      <scope>test</scope>
+      <scope>provided</scope>
     </dependency>
   </dependencies>
 
@@ -134,7 +138,6 @@
             <Export-Package>
               org.apache.poi.*
             </Export-Package>
-<!--
             <Import-Package>
               !org.junit,
               *,
@@ -143,6 +146,7 @@
               org.bouncycastle.cert;resolution:=optional,
               org.bouncycastle.cert.ocsp;resolution:=optional,
               org.bouncycastle.cms.bc;resolution:=optional,
+              org.bouncycastle.cert.jcajce;resolution:=optional,
               org.bouncycastle.operator;resolution:=optional,
               org.bouncycastle.operator.bc;resolution:=optional,
               org.bouncycastle.tsp;resolution:=optional,
@@ -151,7 +155,6 @@
               schemasMicrosoftComOfficePowerpoint;resolution:=optional,
               schemasMicrosoftComOfficeWord;resolution:=optional,
             </Import-Package>
--->
           </instructions>
         </configuration>
       </plugin>
diff --git a/osgi/src/main/java/org/apache/poi/osgi/Activator.java b/osgi/src/main/java/org/apache/poi/osgi/Activator.java
new file mode 100644
index 000000000..2f0212bd4
--- /dev/null
+++ b/osgi/src/main/java/org/apache/poi/osgi/Activator.java
@@ -0,0 +1,28 @@
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+
+package org.apache.poi.osgi;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+    public void start(BundleContext context) throws Exception {
+    }
+    public void stop(BundleContext context) throws Exception {
+    }
+}