diff --git a/webconsole/pom.xml b/webconsole/pom.xml
index 1dc1e1b..f20dff6 100644
--- a/webconsole/pom.xml
+++ b/webconsole/pom.xml
@@ -1,20 +1,20 @@
 <!--
- 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
-
+    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.
+    
+    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.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
@@ -36,8 +36,12 @@
     </description>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/webconsole</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/webconsole</developerConnection>
+        <connection>
+            scm:svn:http://svn.apache.org/repos/asf/felix/trunk/webconsole
+        </connection>
+        <developerConnection>
+            scm:svn:https://svn.apache.org/repos/asf/felix/trunk/webconsole
+        </developerConnection>
         <url>http://svn.apache.org/viewvc/felix/trunk/webconsole</url>
     </scm>
 
@@ -66,12 +70,18 @@
                         <Bundle-SymbolicName>
                             ${artifactId}
                         </Bundle-SymbolicName>
-                        <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
+                        <Bundle-Vendor>
+                            The Apache Software Foundation
+                        </Bundle-Vendor>
+                        <Bundle-DocURL>
+                            http://felix.apache.org
+                        </Bundle-DocURL>
                         <Bundle-Activator>
                             org.apache.felix.webconsole.internal.OsgiManagerActivator
                         </Bundle-Activator>
                         <Export-Package>
                             org.apache.felix.webconsole,
+                            org.osgi.service.obr
                         </Export-Package>
                         <Private-Package>
                             !org.apache.felix.webconsole,
@@ -85,18 +95,21 @@
                             <!-- Required by FileUpload and Util -->
                             org.apache.commons.io,
                             org.apache.commons.io.filefilter,
-                            org.apache.commons.io.output,
-
-                            <!-- Required for JSON data transfer -->
-                            org.json,
-
-                            <!-- Import/Export-Package parsing -->
-                            org.apache.felix.bundlerepository
+                            org.apache.commons.io.output
                         </Private-Package>
                         <Import-Package>
-                            org.apache.felix.*;
-                            org.osgi.service.obr;resolution:=optional,*
+                            org.apache.felix.scr;
+                            org.apache.felix.shell;
+                            org.osgi.service.*;resolution:=optional,*
                         </Import-Package>
+                        
+                        <Embed-Dependency>
+                            <!-- Import/Export-Package parsing, OBR -->
+                            org.apache.felix.bundlerepository,
+                            
+                            <!-- Required for JSON data transfer -->
+                            json
+                        </Embed-Dependency>
                     </instructions>
                 </configuration>
             </plugin>