FELIX-6375 : Configuration Admin Service not available with org.apache.felix.webconsole_4.6.0.all
diff --git a/webconsole/pom.xml b/webconsole/pom.xml
index c7261ef..5a3f93c 100644
--- a/webconsole/pom.xml
+++ b/webconsole/pom.xml
@@ -112,8 +112,10 @@
                         <Export-Package>
                             ${webconsole.exports}
                         </Export-Package>
+                        <!-- Import-Package header is also used for the all bundle -->
                         <Import-Package>
                             javax.servlet.*;version="[2.4,4)",
+                            !javax.portlet,
                             !org.apache.felix.bundlerepository,
                             !org.osgi.service.obr,
                             !org.osgi.service.cm,
@@ -125,6 +127,7 @@
                             !org.osgi.service.wireadmin,
                             *
                         </Import-Package>
+                        <!-- DynamicImport-Package header is also used for the all bundle -->
                         <DynamicImport-Package>
                             org.apache.felix.bundlerepository;version="[2.0,3)",
                             org.osgi.service.obr;version="[1.0,2)",
@@ -238,19 +241,6 @@
                                            commons-fileupload;inline=true,
                                            commons-io;inline=true
                                        </Embed-Dependency>
-                                       <Import-Package>
-                                           javax.servlet.*;version="[2.4,4)",
-                                           !javax.portlet,
-                                           !org.apache.felix.bundlerepository,
-                                           !org.osgi.service.obr,
-                                           !org.osgi.service.cm,
-                                           !org.osgi.service.condpermadmin,
-                                           !org.osgi.service.log,
-                                           !org.osgi.service.metatype,
-                                           !org.osgi.service.permissionadmin,
-                                           !org.osgi.service.prefs,
-                                           !org.osgi.service.wireadmin,
-                                       </Import-Package>                            
                                        <_removeheaders>
                                            Embed-Dependency,Private-Package,Include-Resource
                                        </_removeheaders>