diff --git a/webconsole/pom.xml b/webconsole/pom.xml
index 0c8a2be..6b992d1 100644
--- a/webconsole/pom.xml
+++ b/webconsole/pom.xml
@@ -82,9 +82,16 @@
                 </executions>
             </plugin>
             <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>5</source>
+                    <target>jsr14</target>
+                </configuration>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.4.3</version>
+                <version>2.3.6</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
@@ -100,15 +107,7 @@
                         <Bundle-Activator>
                             org.apache.felix.webconsole.internal.OsgiManagerActivator
                         </Bundle-Activator>
-                        <Export-Package>
-                            org.apache.felix.webconsole;version=3.1.2
-                        </Export-Package>
-                        <Private-Package>
-                            !org.apache.felix.webconsole,
-                            org.apache.felix.webconsole.*,
-                        </Private-Package>
                         <Import-Package>
-                            org.apache.felix.scr;version=1.0;resolution:=optional,
                             org.osgi.service.http,
                             org.apache.felix.shell;
                             org.osgi.service.*;resolution:=optional,
@@ -251,5 +250,13 @@
             <optional>true</optional>
         </dependency>
         
+        <!-- BND annotations -->
+        <dependency>
+            <groupId>biz.aQute</groupId>
+            <artifactId>bndlib</artifactId>
+            <version>1.50.0</version>
+            <scope>provided</scope>
+        </dependency>
+        
     </dependencies>
 </project>
diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/package-info.java b/webconsole/src/main/java/org/apache/felix/webconsole/package-info.java
new file mode 100644
index 0000000..3f43587
--- /dev/null
+++ b/webconsole/src/main/java/org/apache/felix/webconsole/package-info.java
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+
+/**
+ * Provides the plugin and extension API for the Apache Felix Web Console:
+ * <dl>
+ * <dt>{@link org.apache.felix.webconsole.AbstractWebConsolePlugin}</dt>
+ * <dd>Service API for plugins.</dd>
+ * <dt>{@link org.apache.felix.webconsole.ConfigurationPrinter}</dt>
+ * <dd>Service API for plugins for the Configuration Status page.</dd>
+ * <dt>{@link org.apache.felix.webconsole.BrandingPlugin}</dt>
+ * <dd>Service API for the branding of the Web Console.</dd>
+ * <dt>{@link org.apache.felix.webconsole.WebConsoleSecurityProvider}</dt>
+ * <dd>Service API to provide custom authentication and access control.</dd>
+ * </dl>
+ */
+@Version("3.1.2")
+@Export(optional = "provide:=true")
+package org.apache.felix.webconsole;
+
+import aQute.bnd.annotation.Export;
+import aQute.bnd.annotation.Version;
+