diff --git a/bundlerepository/pom.xml b/bundlerepository/pom.xml
index 83d720f..dc1eb29 100644
--- a/bundlerepository/pom.xml
+++ b/bundlerepository/pom.xml
@@ -64,6 +64,7 @@
             <Bundle-Url>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}.jar</Bundle-Url>
             <Bundle-Source>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}-src.jar</Bundle-Source>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Export-Service>org.osgi.service.obr.RepositoryAdmin</Export-Service>
           </instructions>
         </configuration>
diff --git a/configadmin/pom.xml b/configadmin/pom.xml
index 8b7c6df..9eab19b 100644
--- a/configadmin/pom.xml
+++ b/configadmin/pom.xml
@@ -61,6 +61,7 @@
                         <Bundle-SymbolicName>
                             ${artifactId}
                         </Bundle-SymbolicName>
+                        <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
                         <Export-Package>
                             org.apache.felix.cm;
                             org.apache.felix.cm.file;version=1.0,
diff --git a/dependencymanager/pom.xml b/dependencymanager/pom.xml
index 1eabc48..a0a10aa 100644
--- a/dependencymanager/pom.xml
+++ b/dependencymanager/pom.xml
@@ -55,7 +55,7 @@
             <Bundle-SymbolicName>org.apache.felix.dependencymanager</Bundle-SymbolicName>
             <Bundle-Name>Apache Felix Dependency Manager</Bundle-Name>
             <Bundle-Description>A bundle that provides a run-time service dependency manager.</Bundle-Description>
-            <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Export-Package>org.apache.felix.dependencymanager</Export-Package>
             <Import-Package>!org.apache.felix.dependencymanager,*</Import-Package>
           </instructions>
diff --git a/deploymentadmin/pom.xml b/deploymentadmin/pom.xml
index 0b3d90d..4be5396 100644
--- a/deploymentadmin/pom.xml
+++ b/deploymentadmin/pom.xml
@@ -60,11 +60,11 @@
           <instructions>
             <Bundle-SymbolicName>org.apache.felix.deploymentadmin</Bundle-SymbolicName>
             <Bundle-Activator>org.apache.felix.deploymentadmin.Activator</Bundle-Activator>
-	    <Bundle-Name>Apache Felix Deployment Admin</Bundle-Name>
+            <Bundle-Name>Apache Felix Deployment Admin</Bundle-Name>
             <Bundle-Description>A bundle that implements the Deployment Admin.</Bundle-Description>
-            <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
-	    <Private-Package>org.apache.felix.deploymentadmin.spi</Private-Package>
-	    <Export-Package>org.apache.felix.deploymentadmin,org.osgi.service.deploymentadmin.*;version="1.0.0"</Export-Package>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
+            <Private-Package>org.apache.felix.deploymentadmin.spi</Private-Package>
+            <Export-Package>org.apache.felix.deploymentadmin,org.osgi.service.deploymentadmin.*;version="1.0.0"</Export-Package>
           </instructions>
         </configuration>
       </plugin>
diff --git a/eventadmin/bridge.configuration/pom.xml b/eventadmin/bridge.configuration/pom.xml
index 5f09a3a..15f25fd 100644
--- a/eventadmin/bridge.configuration/pom.xml
+++ b/eventadmin/bridge.configuration/pom.xml
@@ -54,6 +54,7 @@
           <instructions>
             <Bundle-Activator>${pom.artifactId}.Activator</Bundle-Activator>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Private-Package>${pom.artifactId}.*</Private-Package>
           </instructions>
         </configuration>
diff --git a/eventadmin/bridge.upnp/pom.xml b/eventadmin/bridge.upnp/pom.xml
index 67cc191..baf7eba 100644
--- a/eventadmin/bridge.upnp/pom.xml
+++ b/eventadmin/bridge.upnp/pom.xml
@@ -54,6 +54,7 @@
           <instructions>
             <Bundle-Activator>${pom.artifactId}.Activator</Bundle-Activator>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Import-Service>
             	org.osgi.service.event.EventAdmin,
        		org.osgi.service.event.EventHandler
diff --git a/eventadmin/bridge.useradmin/pom.xml b/eventadmin/bridge.useradmin/pom.xml
index 1186c22..e2db651 100644
--- a/eventadmin/bridge.useradmin/pom.xml
+++ b/eventadmin/bridge.useradmin/pom.xml
@@ -54,6 +54,7 @@
           <instructions>
             <Bundle-Activator>${pom.artifactId}.Activator</Bundle-Activator>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Private-Package>${pom.artifactId}.*</Private-Package>
           </instructions>
         </configuration>
diff --git a/eventadmin/bridge.wireadmin/pom.xml b/eventadmin/bridge.wireadmin/pom.xml
index f5e88b0..db5ec3c 100644
--- a/eventadmin/bridge.wireadmin/pom.xml
+++ b/eventadmin/bridge.wireadmin/pom.xml
@@ -52,8 +52,8 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <bundleName>EventAdmin Bridge WireAdmin</bundleName>
-            <bundleVendor>Apache Software Foundation</bundleVendor>
+            <Bundle-Name>EventAdmin Bridge WireAdmin</Bundle-Name>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Bundle-Activator>${pom.artifactId}.Activator</Bundle-Activator>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
             <Private-Package>${pom.artifactId}.*</Private-Package>
diff --git a/eventadmin/impl/pom.xml b/eventadmin/impl/pom.xml
index 7bb8ea4..2aeca95 100644
--- a/eventadmin/impl/pom.xml
+++ b/eventadmin/impl/pom.xml
@@ -54,10 +54,11 @@
           <instructions>
             <Bundle-SymbolicName>
               ${pom.artifactId} 
-	    </Bundle-SymbolicName>
-  	    <Bundle-Activator>
+	        </Bundle-SymbolicName>
+  	        <Bundle-Activator>
               ${pom.artifactId}.impl.Activator
             </Bundle-Activator>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <DynamicImport-Package>
               org.osgi.service.log
             </DynamicImport-Package>
diff --git a/examples/dictionaryclient/pom.xml b/examples/dictionaryclient/pom.xml
index 1a2c9c3..c7751af 100644
--- a/examples/dictionaryclient/pom.xml
+++ b/examples/dictionaryclient/pom.xml
@@ -53,7 +53,7 @@
           <instructions>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
             <Bundle-Name>Example Dictionary Client</Bundle-Name>
-            <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Bundle-Description>
               A bundle using the dictionary service if it finds it at startup.
             </Bundle-Description>
diff --git a/examples/dictionaryclient2/pom.xml b/examples/dictionaryclient2/pom.xml
index 311b975..05d1018 100644
--- a/examples/dictionaryclient2/pom.xml
+++ b/examples/dictionaryclient2/pom.xml
@@ -53,7 +53,7 @@
           <instructions>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
             <Bundle-Name>Example Dynamic Dictionary Client</Bundle-Name>
-            <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Bundle-Description>
               A client bundle with more complex requirements for the dictionary.
             </Bundle-Description>
diff --git a/examples/dictionaryservice.itest/pom.xml b/examples/dictionaryservice.itest/pom.xml
index 3dbe31a..8a0ee33 100644
--- a/examples/dictionaryservice.itest/pom.xml
+++ b/examples/dictionaryservice.itest/pom.xml
@@ -86,7 +86,7 @@
               org.apache.felix.examples.dictionaryservice.itest.*
             </Private-Package>
             <Bundle-Name>Example Dictionary Integration Test</Bundle-Name>
-            <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Bundle-Description>
               A bundle using the dictionary service to test it.
             </Bundle-Description>
diff --git a/examples/dictionaryservice/pom.xml b/examples/dictionaryservice/pom.xml
index 1134478..0ea4f5d 100644
--- a/examples/dictionaryservice/pom.xml
+++ b/examples/dictionaryservice/pom.xml
@@ -47,7 +47,7 @@
           <instructions>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
             <Bundle-Name>Example English Dictionary</Bundle-Name>
-            <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Bundle-Description>
               A bundle that registersan English dictionary service.
             </Bundle-Description>
diff --git a/examples/eventlistener/pom.xml b/examples/eventlistener/pom.xml
index 28c5a5d..405984a 100644
--- a/examples/eventlistener/pom.xml
+++ b/examples/eventlistener/pom.xml
@@ -47,6 +47,7 @@
           <instructions>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
             <Bundle-Name>Example Service Listener</Bundle-Name>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Bundle-Description>
               Bundle listening for service events: displays a message on startup and when service events occur.
             </Bundle-Description>
diff --git a/examples/extenderbased.circle/pom.xml b/examples/extenderbased.circle/pom.xml
index 0184762..03d876d 100644
--- a/examples/extenderbased.circle/pom.xml
+++ b/examples/extenderbased.circle/pom.xml
@@ -53,6 +53,7 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Extension-Name>Circle</Extension-Name>
             <Extension-Icon>org/apache/felix/example/extenderbased/circle/circle.png</Extension-Icon>
             <Extension-Class>org.apache.felix.example.extenderbased.circle.Circle</Extension-Class>
diff --git a/examples/extenderbased.host/pom.xml b/examples/extenderbased.host/pom.xml
index ef3e902..8b3dedc 100644
--- a/examples/extenderbased.host/pom.xml
+++ b/examples/extenderbased.host/pom.xml
@@ -53,6 +53,7 @@
             <Export-Package>org.apache.felix.example.extenderbased.host.extension.*</Export-Package>
             <Private-Package>org.apache.felix.example.extenderbased.host.*,org.apache.felix.moduleloader.*,org.apache.felix.framework.*,org.apache.felix.main,org.osgi.*</Private-Package>
             <Bundle-Activator>org.apache.felix.example.extenderbased.host.Activator</Bundle-Activator>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
           </instructions>
         </configuration>
       </plugin>
diff --git a/examples/extenderbased.square/pom.xml b/examples/extenderbased.square/pom.xml
index 8eb2f1b..2cebdbc 100644
--- a/examples/extenderbased.square/pom.xml
+++ b/examples/extenderbased.square/pom.xml
@@ -57,6 +57,7 @@
             <Extension-Icon>org/apache/felix/example/extenderbased/square/square.png</Extension-Icon>
             <Extension-Class>org.apache.felix.example.extenderbased.square.Square</Extension-Class>
             <Private-Package>org.apache.felix.example.extenderbased.square.*</Private-Package>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
           </instructions>
         </configuration>
       </plugin>
diff --git a/examples/extenderbased.triangle/pom.xml b/examples/extenderbased.triangle/pom.xml
index 3e8abb2..b0321ef 100644
--- a/examples/extenderbased.triangle/pom.xml
+++ b/examples/extenderbased.triangle/pom.xml
@@ -57,6 +57,7 @@
             <Extension-Icon>org/apache/felix/example/extenderbased/triangle/triangle.png</Extension-Icon>
             <Extension-Class>org.apache.felix.example.extenderbased.triangle.Triangle</Extension-Class>
             <Private-Package>org.apache.felix.example.extenderbased.triangle.*</Private-Package>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
           </instructions>
         </configuration>
       </plugin>
diff --git a/examples/frenchdictionary/pom.xml b/examples/frenchdictionary/pom.xml
index c695c1c..df4065a 100644
--- a/examples/frenchdictionary/pom.xml
+++ b/examples/frenchdictionary/pom.xml
@@ -53,7 +53,7 @@
           <instructions>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
             <Bundle-Name>Example French Dictionary</Bundle-Name>
-            <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Bundle-Description>
               A bundle that registers a French dictionary service.
             </Bundle-Description>
diff --git a/examples/servicebased.circle/pom.xml b/examples/servicebased.circle/pom.xml
index d2d6b3c..37d8fe0 100644
--- a/examples/servicebased.circle/pom.xml
+++ b/examples/servicebased.circle/pom.xml
@@ -55,6 +55,7 @@
           <instructions>
             <Private-Package>org.apache.felix.example.servicebased.circle.*</Private-Package>
             <Bundle-Activator>org.apache.felix.example.servicebased.circle.Activator</Bundle-Activator>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
           </instructions>
         </configuration>
       </plugin>
diff --git a/examples/servicebased.host/pom.xml b/examples/servicebased.host/pom.xml
index 59936d3..2bfc148 100644
--- a/examples/servicebased.host/pom.xml
+++ b/examples/servicebased.host/pom.xml
@@ -53,6 +53,7 @@
             <Export-Package>org.apache.felix.example.servicebased.host.service.*</Export-Package>
             <Private-Package>org.apache.felix.example.servicebased.host.*,org.apache.felix.moduleloader.*,org.apache.felix.framework.*,org.apache.felix.main,org.osgi.*</Private-Package>
             <Bundle-Activator>org.apache.felix.example.servicebased.host.Activator</Bundle-Activator>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
           </instructions>
         </configuration>
       </plugin>
diff --git a/examples/servicebased.square/pom.xml b/examples/servicebased.square/pom.xml
index ad5e6b2..bb6967a 100644
--- a/examples/servicebased.square/pom.xml
+++ b/examples/servicebased.square/pom.xml
@@ -55,6 +55,7 @@
           <instructions>
             <Private-Package>org.apache.felix.example.servicebased.square.*</Private-Package>
             <Bundle-Activator>org.apache.felix.example.servicebased.square.Activator</Bundle-Activator>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
           </instructions>
         </configuration>
       </plugin>
diff --git a/examples/servicebased.triangle/pom.xml b/examples/servicebased.triangle/pom.xml
index 0cb7df3..e8ca38f 100644
--- a/examples/servicebased.triangle/pom.xml
+++ b/examples/servicebased.triangle/pom.xml
@@ -55,6 +55,7 @@
           <instructions>
             <Private-Package>org.apache.felix.example.servicebased.triangle.*</Private-Package>
             <Bundle-Activator>org.apache.felix.example.servicebased.triangle.Activator</Bundle-Activator>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
           </instructions>
         </configuration>
       </plugin>
diff --git a/examples/spellcheckbinder/pom.xml b/examples/spellcheckbinder/pom.xml
index b568528..029f21f 100644
--- a/examples/spellcheckbinder/pom.xml
+++ b/examples/spellcheckbinder/pom.xml
@@ -66,7 +66,7 @@
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
             <Metadata-Location>metadata.xml</Metadata-Location>
             <Bundle-Name>Example Spell Check w/ Service Binder</Bundle-Name>
-            <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Bundle-Description>
               A bundle that registers a spell checking service based on service binder.
             </Bundle-Description>
diff --git a/examples/spellcheckclient/pom.xml b/examples/spellcheckclient/pom.xml
index 1640010..9c9c758 100644
--- a/examples/spellcheckclient/pom.xml
+++ b/examples/spellcheckclient/pom.xml
@@ -53,7 +53,7 @@
           <instructions>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
             <Bundle-Name>Example Spell Check Client</Bundle-Name>
-            <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Bundle-Description>
               A bundle using the spell check service.
             </Bundle-Description>
diff --git a/examples/spellcheckscr/pom.xml b/examples/spellcheckscr/pom.xml
index 37ec185..e0b298c 100644
--- a/examples/spellcheckscr/pom.xml
+++ b/examples/spellcheckscr/pom.xml
@@ -69,7 +69,7 @@
             <Import-Package>*</Import-Package>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
             <Bundle-Description>${description}</Bundle-Description>
-            <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Service-Component>OSGI-INF/component.xml</Service-Component>
           </instructions>
         </configuration>
diff --git a/examples/spellcheckservice/pom.xml b/examples/spellcheckservice/pom.xml
index 17e58e2..e8fb78f 100644
--- a/examples/spellcheckservice/pom.xml
+++ b/examples/spellcheckservice/pom.xml
@@ -53,7 +53,7 @@
           <instructions>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
             <Bundle-Name>Example Spell Check Service</Bundle-Name>
-            <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Bundle-Description>
               A bundle that registers a spell checking service.
             </Bundle-Description>
diff --git a/fileinstall/pom.xml b/fileinstall/pom.xml
index b12483b..7ac3da3 100644
--- a/fileinstall/pom.xml
+++ b/fileinstall/pom.xml
@@ -53,6 +53,7 @@
             <Export-Package>org.apache.felix.fileinstall,org.osgi.service.cm</Export-Package>
             <Bundle-Activator>org.apache.felix.fileinstall.FileInstall</Bundle-Activator>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
           </instructions>
         </configuration>
       </plugin>
diff --git a/framework.security/pom.xml b/framework.security/pom.xml
index 122d2c9..7b62644 100644
--- a/framework.security/pom.xml
+++ b/framework.security/pom.xml
@@ -53,6 +53,7 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Export-Package>org.osgi.service.permissionadmin;-split-package:=merge-first, org.osgi.service.condpermadmin;-split-package:=merge-first</Export-Package>
             <Private-Package>org.apache.felix.framework.*</Private-Package>
             <Import-Package>!*</Import-Package>
diff --git a/framework/pom.xml b/framework/pom.xml
index d391922..d5cc7bf 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -51,6 +51,7 @@
           <instructions>
             <Bundle-Name>Apache Felix Framework</Bundle-Name>
             <Bundle-Description>OSGi R4 framework implementation.</Bundle-Description>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Export-Package>org.osgi.framework;-split-package:=merge-first,org.osgi.service.packageadmin,org.osgi.service.url,org.osgi.service.startlevel,org.osgi.util.tracker</Export-Package>
             <Private-Package>org.apache.felix.moduleloader.*,org.apache.felix.framework.*</Private-Package>
             <Import-Package>!*</Import-Package>
diff --git a/http.jetty/pom.xml b/http.jetty/pom.xml
index 8991435..4da8638 100644
--- a/http.jetty/pom.xml
+++ b/http.jetty/pom.xml
@@ -90,6 +90,7 @@
                         <Bundle-SymbolicName>
                             ${pom.artifactId}
                         </Bundle-SymbolicName>
+                        <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
                         <Export-Package>
                             org.osgi.service.http; version=1.1,
                             javax.servlet;javax.servlet.http;version=2.5
diff --git a/ipojo/annotations/pom.xml b/ipojo/annotations/pom.xml
index 989dd2e..5af7eb3 100644
--- a/ipojo/annotations/pom.xml
+++ b/ipojo/annotations/pom.xml
@@ -48,7 +48,7 @@
     	<configuration>
         	<instructions>          
           		<Bundle-Name>iPOJO Annotation</Bundle-Name>
-		        <Bundle-Vendor>Clement ESCOFFIER</Bundle-Vendor>
+                <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
         		<Bundle-Description> iPOJO Annotations </Bundle-Description>
           		<Export-Package>org.apache.felix.ipojo.annotations</Export-Package>
         	</instructions>
diff --git a/ipojo/ant/pom.xml b/ipojo/ant/pom.xml
index ed2bede..7956a86 100644
--- a/ipojo/ant/pom.xml
+++ b/ipojo/ant/pom.xml
@@ -64,7 +64,7 @@
 				<configuration>
 					<instructions>
 						<Bundle-Name>iPOJO Ant Task</Bundle-Name>
-						<Bundle-Vendor>Clement ESCOFFIER</Bundle-Vendor>
+                        <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
 						<Bundle-Description>
 							iPOJO Ant Task
 						</Bundle-Description>
diff --git a/ipojo/arch/pom.xml b/ipojo/arch/pom.xml
index 5cf3bd8..6e8650d 100644
--- a/ipojo/arch/pom.xml
+++ b/ipojo/arch/pom.xml
@@ -61,6 +61,7 @@
 						<Bundle-SymbolicName>
 							${pom.artifactId}
 						</Bundle-SymbolicName>
+             <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
 						<Private-Package>
 							org.apache.felix.ipojo.arch
 						</Private-Package>
diff --git a/ipojo/core/pom.xml b/ipojo/core/pom.xml
index 113e48d..eb5aa4e 100644
--- a/ipojo/core/pom.xml
+++ b/ipojo/core/pom.xml
@@ -61,7 +61,7 @@
 				<configuration>
 					<instructions>
 						<Bundle-Name>iPOJO</Bundle-Name>
-						<Bundle-Vendor>Clement ESCOFFIER</Bundle-Vendor>
+                        <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
 						<Bundle-Description>
 							iPOJO Core Framework
 						</Bundle-Description>
diff --git a/ipojo/event.admin.handler/pom.xml b/ipojo/event.admin.handler/pom.xml
index 2c44f96..ab82218 100644
--- a/ipojo/event.admin.handler/pom.xml
+++ b/ipojo/event.admin.handler/pom.xml
@@ -63,6 +63,7 @@
 						<Bundle-SymbolicName>
 							ipojo.event.admin.handler
 						</Bundle-SymbolicName>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
 					</instructions>
 				</configuration>
 			</plugin>
diff --git a/ipojo/jmx.handler/pom.xml b/ipojo/jmx.handler/pom.xml
index 04def15..df990f9 100644
--- a/ipojo/jmx.handler/pom.xml
+++ b/ipojo/jmx.handler/pom.xml
@@ -63,6 +63,7 @@
 						<Bundle-SymbolicName>
 							ipojo.jmx.handler
 						</Bundle-SymbolicName>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
 					</instructions>
 				</configuration>
 			</plugin>
diff --git a/ipojo/manipulator/pom.xml b/ipojo/manipulator/pom.xml
index 9491919..b4419ed 100644
--- a/ipojo/manipulator/pom.xml
+++ b/ipojo/manipulator/pom.xml
@@ -60,7 +60,7 @@
 				<configuration>
 					<instructions>
 						<Bundle-Name>iPOJO Manipulator</Bundle-Name>
-						<Bundle-Vendor>Clement ESCOFFIER</Bundle-Vendor>
+                        <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
 						<Bundle-Description>
 							iPOJO Manipulator
 						</Bundle-Description>
diff --git a/ipojo/metadata/pom.xml b/ipojo/metadata/pom.xml
index 3c7a2e7..a42c946 100644
--- a/ipojo/metadata/pom.xml
+++ b/ipojo/metadata/pom.xml
@@ -39,7 +39,7 @@
 				<configuration>
 					<instructions>
 						<Bundle-Name>iPOJO Metadata</Bundle-Name>
-						<Bundle-Vendor>Clement ESCOFFIER</Bundle-Vendor>
+                        <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
 						<Bundle-Description>
 							iPOJO Metadata
 						</Bundle-Description>
diff --git a/javax.servlet/pom.xml b/javax.servlet/pom.xml
index 0c38e9a..bbaec49 100644
--- a/javax.servlet/pom.xml
+++ b/javax.servlet/pom.xml
@@ -39,6 +39,7 @@
         <configuration>
           <instructions>
             <Bundle-Copyright>Copyright 1999,2005 The Apache Software Foundation</Bundle-Copyright>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Bundle-Category>servlet</Bundle-Category>
             <Export-Package>javax.servlet;specification-version="2.1",javax.servlet.http;specification-version="2.1"</Export-Package>
             <Import-Package>!javax.servlet.*,*</Import-Package>
diff --git a/jmood/pom.xml b/jmood/pom.xml
index 2a7b001..a9c1450 100644
--- a/jmood/pom.xml
+++ b/jmood/pom.xml
@@ -90,6 +90,7 @@
                         <Private-Package>
                             org.apache.felix.jmood.*
                         </Private-Package>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/jmxintrospector/pom.xml b/jmxintrospector/pom.xml
index 955a6d7..ce3876e 100644
--- a/jmxintrospector/pom.xml
+++ b/jmxintrospector/pom.xml
@@ -59,6 +59,7 @@
                             org.objectweb.asm.util;resolution:=optional,
                             *
                         </Import-Package>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/log/pom.xml b/log/pom.xml
index 0d35ca6..e4c4353 100644
--- a/log/pom.xml
+++ b/log/pom.xml
@@ -56,6 +56,7 @@
             <Private-Package>org.apache.felix.log.impl</Private-Package>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
             <Bundle-Activator>${pom.artifactId}.impl.Activator</Bundle-Activator>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Export-Service>org.osgi.service.log.LogService,org.osgi.service.log.LogReaderService</Export-Service>
           </instructions>
         </configuration>
diff --git a/main/pom.xml b/main/pom.xml
index 0e264b05..39a4ae1 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -102,6 +102,7 @@
             <Main-Class>org.apache.felix.main.Main</Main-Class>
             <Bundle-Name>Apache Felix</Bundle-Name>
             <Bundle-Description>OSGi R4 framework.</Bundle-Description>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Private-Package>org.apache.felix.main.*,org.apache.felix.moduleloader.*;-split-package:=merge-first,org.apache.felix.framework.*;-split-package:=merge-first,org.osgi.framework;-split-package:=merge-first,org.osgi.service.packageadmin;-split-package:=merge-first,org.osgi.service.startlevel;-split-package:=merge-first,org.osgi.service.url;-split-package:=merge-first,org.osgi.util.tracker;-split-package:=merge-first</Private-Package>
             <Import-Package>!*</Import-Package>
             <Include-Resource>{src/main/resources/}</Include-Resource>
diff --git a/metatype/pom.xml b/metatype/pom.xml
index 2489159..bcb61cc 100644
--- a/metatype/pom.xml
+++ b/metatype/pom.xml
@@ -65,6 +65,7 @@
                         <Bundle-SymbolicName>
                             ${artifactId}
                         </Bundle-SymbolicName>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
                         <Export-Package>
                             org.apache.felix.metatype,
                             org.osgi.service.metatype; version=1.1
diff --git a/mosgi/console.component/pom.xml b/mosgi/console.component/pom.xml
index e893392..5763763 100644
--- a/mosgi/console.component/pom.xml
+++ b/mosgi/console.component/pom.xml
@@ -66,6 +66,7 @@
             <Bundle-Description>MOSGi JMX Console main GUI component</Bundle-Description>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
 	    <Bundle-Activator>org.apache.felix.mosgi.console.component.Activator</Bundle-Activator>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
 	    <Private-Package>${pom.artifactId}</Private-Package>
 
           </instructions>
diff --git a/mosgi/console.gui/pom.xml b/mosgi/console.gui/pom.xml
index 4c32540..081b3d9 100644
--- a/mosgi/console.gui/pom.xml
+++ b/mosgi/console.gui/pom.xml
@@ -86,6 +86,7 @@
             <Bundle-Description>MOSGi JMX Console main GUI</Bundle-Description>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
 	    <Bundle-Activator>org.apache.felix.mosgi.console.gui.Activator</Bundle-Activator>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
 	    <Private-Package>${pom.artifactId}</Private-Package>
           </instructions>
         </configuration>
diff --git a/mosgi/console.ifc/pom.xml b/mosgi/console.ifc/pom.xml
index b1a65c0..747d6e3 100644
--- a/mosgi/console.ifc/pom.xml
+++ b/mosgi/console.ifc/pom.xml
@@ -58,6 +58,7 @@
             <Bundle-Name>MOSGi JMX Console  Ifc</Bundle-Name>
             <Bundle-Description>MOSGi JMX Console Ifc</Bundle-Description>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Export-Package>${pom.artifactId}</Export-Package>
           </instructions>
         </configuration>
diff --git a/mosgi/jmx.agent/pom.xml b/mosgi/jmx.agent/pom.xml
index a429f02..0706db1 100644
--- a/mosgi/jmx.agent/pom.xml
+++ b/mosgi/jmx.agent/pom.xml
@@ -73,6 +73,7 @@
             <Bundle-Description>MOSGi JMX-MX4J Agent Service</Bundle-Description>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
 	    <Bundle-Activator>org.apache.felix.mosgi.jmx.agent.AgentActivator</Bundle-Activator>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Export-Package>${pom.artifactId},
               org.apache.felix.mosgi.jmx.agent.mx4j.server,
               org.apache.felix.mosgi.jmx.agent.mx4j.server.interceptor,
diff --git a/mosgi/jmx.httpconnector/pom.xml b/mosgi/jmx.httpconnector/pom.xml
index 19aa099..4aff600 100644
--- a/mosgi/jmx.httpconnector/pom.xml
+++ b/mosgi/jmx.httpconnector/pom.xml
@@ -78,6 +78,7 @@
             <Bundle-Description>MOSGi JMX-MX4J http connector</Bundle-Description>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
 	    <Bundle-Activator>org.apache.felix.mosgi.jmx.httpconnector.HttpConnectorActivator</Bundle-Activator>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
 	    <Private-Package>${pom.artifactId}.*</Private-Package>
           </instructions>
         </configuration>
diff --git a/mosgi/jmx.registry/pom.xml b/mosgi/jmx.registry/pom.xml
index 45719e2..156c14f 100644
--- a/mosgi/jmx.registry/pom.xml
+++ b/mosgi/jmx.registry/pom.xml
@@ -71,6 +71,7 @@
             <Bundle-Name>MOSGi JMX rmiregistry</Bundle-Name>
             <Bundle-Description>MOSGi JMX rmiregistry</Bundle-Description>
 	    <Bundle-Activator>org.apache.felix.mosgi.jmx.registry.mx4j.tools.naming.NamingService</Bundle-Activator>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Export-Package>${pom.artifactId}.mx4j.tools.naming</Export-Package>
 	    <DynamicImport-Package>*</DynamicImport-Package>
           </instructions>
diff --git a/mosgi/jmx.remotelogger/pom.xml b/mosgi/jmx.remotelogger/pom.xml
index 6f1399b..1fba7aa 100644
--- a/mosgi/jmx.remotelogger/pom.xml
+++ b/mosgi/jmx.remotelogger/pom.xml
@@ -66,6 +66,7 @@
             <Bundle-Description>MOSGi JMX remote logger</Bundle-Description>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
 	    <Bundle-Activator>org.apache.felix.mosgi.jmx.remotelogger.Logger</Bundle-Activator>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
 	    <Private-Package>${pom.artifactId}.*</Private-Package>
           </instructions>
         </configuration>
diff --git a/mosgi/jmx.rmiconnector/pom.xml b/mosgi/jmx.rmiconnector/pom.xml
index 67a4c5c..d8c5729 100644
--- a/mosgi/jmx.rmiconnector/pom.xml
+++ b/mosgi/jmx.rmiconnector/pom.xml
@@ -91,6 +91,7 @@
             <Bundle-Description>MOSGi JMX-MX4J RMI Connector</Bundle-Description>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
 	    <Bundle-Activator>org.apache.felix.mosgi.jmx.rmiconnector.RmiConnectorActivator</Bundle-Activator>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Export-Package>org.apache.felix.mosgi.jmx.rmiconnector.mx4j.remote.provider.rmi </Export-Package>
 	    <Private-Package>${pom.artifactId}.*</Private-Package>
           </instructions>
diff --git a/mosgi/managedelements.bundlesprobes.tab/pom.xml b/mosgi/managedelements.bundlesprobes.tab/pom.xml
index 0d3cc9a..f1c147a 100644
--- a/mosgi/managedelements.bundlesprobes.tab/pom.xml
+++ b/mosgi/managedelements.bundlesprobes.tab/pom.xml
@@ -78,6 +78,7 @@
             <Bundle-Name>MOSGi Bundles management tab for the JMX console</Bundle-Name>
             <Bundle-Description>MOSGi Bundles management tab for the JMX console</Bundle-Description>
 	    <Bundle-Activator>org.apache.felix.mosgi.managedelements.bundlesprobes.tab.BundlesProbesTabUI</Bundle-Activator>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Export-Package>${pom.artifactId}</Export-Package>
           </instructions>
         </configuration>
diff --git a/mosgi/managedelements.bundlesprobes/pom.xml b/mosgi/managedelements.bundlesprobes/pom.xml
index fe48fa3..1a490af 100644
--- a/mosgi/managedelements.bundlesprobes/pom.xml
+++ b/mosgi/managedelements.bundlesprobes/pom.xml
@@ -76,7 +76,8 @@
           <instructions>
             <Bundle-Name>MOSGi JMX MBean for OSGi bundles management</Bundle-Name>
             <Bundle-Description>MOSGi JMX MBean for OSGi bundles management</Bundle-Description>
-	    <Bundle-Activator>org.apache.felix.mosgi.managedelements.bundlesprobes.BundlesProbes</Bundle-Activator>
+   	    <Bundle-Activator>org.apache.felix.mosgi.managedelements.bundlesprobes.BundlesProbes</Bundle-Activator>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Export-Package>${pom.artifactId}</Export-Package>
           </instructions>
         </configuration>
diff --git a/mosgi/managedelements.memoryprobe/pom.xml b/mosgi/managedelements.memoryprobe/pom.xml
index 09b5a03..dbaa42d 100644
--- a/mosgi/managedelements.memoryprobe/pom.xml
+++ b/mosgi/managedelements.memoryprobe/pom.xml
@@ -84,6 +84,7 @@
             <Bundle-Description>MOSGi JMX MBean for memory supervision</Bundle-Description>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
 	    <Bundle-Activator>org.apache.felix.mosgi.managedelements.memoryprobe.MemoryProbe</Bundle-Activator>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
 	    <Private-Package>${pom.artifactId}</Private-Package>
           </instructions>
         </configuration>
diff --git a/mosgi/managedelements.obrprobe.tab/pom.xml b/mosgi/managedelements.obrprobe.tab/pom.xml
index 543aa58..957f526 100644
--- a/mosgi/managedelements.obrprobe.tab/pom.xml
+++ b/mosgi/managedelements.obrprobe.tab/pom.xml
@@ -78,6 +78,7 @@
             <Bundle-Description>MOSGi obr remote manipulation tab for the JMX console</Bundle-Description>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
 	    <Bundle-Activator>org.apache.felix.mosgi.managedelements.obrprobe.tab.ObrProbeTabUI</Bundle-Activator>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Export-Package>${pom.artifactId}</Export-Package>
           </instructions>
         </configuration>
diff --git a/mosgi/managedelements.obrprobe/pom.xml b/mosgi/managedelements.obrprobe/pom.xml
index 20e7ef0..e99f732 100644
--- a/mosgi/managedelements.obrprobe/pom.xml
+++ b/mosgi/managedelements.obrprobe/pom.xml
@@ -85,6 +85,7 @@
             <Bundle-Description>MOSGi JMX MBean for obr interaction</Bundle-Description>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
 	    <Bundle-Activator>org.apache.felix.mosgi.managedelements.obrprobe.ObrProbe</Bundle-Activator>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Export-Package>${pom.artifactId}</Export-Package>
           </instructions>
         </configuration>
diff --git a/mosgi/managedelements.osgiprobes.tab/pom.xml b/mosgi/managedelements.osgiprobes.tab/pom.xml
index 2a42f70..1200da4 100644
--- a/mosgi/managedelements.osgiprobes.tab/pom.xml
+++ b/mosgi/managedelements.osgiprobes.tab/pom.xml
@@ -72,6 +72,7 @@
             <Bundle-Description>MOSGi OSGi gateway status tab for the JMX console</Bundle-Description>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
 	    <Bundle-Activator>org.apache.felix.mosgi.managedelements.osgiprobes.tab.OsgiProbesTabUI</Bundle-Activator>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Export-Package>${pom.artifactId}</Export-Package>
           </instructions>
         </configuration>
diff --git a/mosgi/managedelements.osgiprobes/pom.xml b/mosgi/managedelements.osgiprobes/pom.xml
index 651a8ae..8cae93e 100644
--- a/mosgi/managedelements.osgiprobes/pom.xml
+++ b/mosgi/managedelements.osgiprobes/pom.xml
@@ -78,6 +78,7 @@
             <Bundle-Description>MOSGi JMX MBean for OSGi gateway status</Bundle-Description>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
 	    <Bundle-Activator>org.apache.felix.mosgi.managedelements.osgiprobes.OsgiProbes</Bundle-Activator>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Export-Package>${pom.artifactId}</Export-Package>
           </instructions>
         </configuration>
diff --git a/prefs/pom.xml b/prefs/pom.xml
index 2d76063..e6b17c5 100644
--- a/prefs/pom.xml
+++ b/prefs/pom.xml
@@ -67,6 +67,7 @@
                         <Bundle-SymbolicName>
                             ${artifactId}
                         </Bundle-SymbolicName>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
                         <Export-Package>
                             org.apache.felix.prefs,
                             org.osgi.service.prefs;version=1.1
diff --git a/scr/pom.xml b/scr/pom.xml
index fbd77a1..d15346b 100644
--- a/scr/pom.xml
+++ b/scr/pom.xml
@@ -65,9 +65,7 @@
                         <Bundle-SymbolicName>
                             ${artifactId}
                         </Bundle-SymbolicName>
-                        <Bundle-Vendor>
-                            Apache Software Foundation
-                        </Bundle-Vendor>
+                        <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
                         <Bundle-Activator>
                             org.apache.felix.scr.impl.Activator
                         </Bundle-Activator>
diff --git a/servicebinder/pom.xml b/servicebinder/pom.xml
index 2ce5850..fd65fc8 100644
--- a/servicebinder/pom.xml
+++ b/servicebinder/pom.xml
@@ -52,7 +52,7 @@
           <instructions>
             <Bundle-Name>Service Binder</Bundle-Name>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-            <Bundle-Vendor>Apache Felix</Bundle-Vendor>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <!--<Bundle-Version>1.1.2</Bundle-Version>-->
             <Bundle-Description>
               This bundle provides a mechanism to automate service dependency management.
diff --git a/shell.gui.plugin/pom.xml b/shell.gui.plugin/pom.xml
index 8ddaa46..7998494 100644
--- a/shell.gui.plugin/pom.xml
+++ b/shell.gui.plugin/pom.xml
@@ -67,6 +67,7 @@
             <Bundle-Description>A simple set of plugins for the ShellGUI bundle.</Bundle-Description>
             <Bundle-Activator>org.apache.felix.shell.gui.plugin.Activator</Bundle-Activator>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Export-Service>org.apache.felix.shell.gui.Plugin</Export-Service>
             <Import-Service>org.apache.felix.shell.ShellService,org.apache.felix.bundlerepository.RepostioryAdmin</Import-Service>
             <Private-Package>org.apache.felix.shell.gui.plugin.*</Private-Package>
diff --git a/shell.gui/pom.xml b/shell.gui/pom.xml
index 4abd3d2..7f61b16 100644
--- a/shell.gui/pom.xml
+++ b/shell.gui/pom.xml
@@ -49,6 +49,7 @@
             <Bundle-Description>A simple plugin-oriented GUI shell.</Bundle-Description>
             <Bundle-Activator>org.apache.felix.shell.gui.impl.Activator</Bundle-Activator>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Export-Package>org.apache.felix.shell.gui; specification-version="1.0.0"</Export-Package>
             <Private-Package>org.apache.felix.shell.gui.impl</Private-Package>
           </instructions>
diff --git a/shell.tui/pom.xml b/shell.tui/pom.xml
index a2bbf7a..338061e 100644
--- a/shell.tui/pom.xml
+++ b/shell.tui/pom.xml
@@ -56,6 +56,7 @@
             <Bundle-Url>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}.jar</Bundle-Url>
             <Bundle-Source>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}-src.jar</Bundle-Source>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Import-Service>org.apache.felix.shell.ShellService</Import-Service>
           </instructions>
         </configuration>
diff --git a/shell/pom.xml b/shell/pom.xml
index a2f8a56..3b20ba2 100644
--- a/shell/pom.xml
+++ b/shell/pom.xml
@@ -49,6 +49,7 @@
             <Private-Package>org.apache.felix.*</Private-Package>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
             <Bundle-Activator>org.apache.felix.shell.impl.Activator</Bundle-Activator>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Export-Service>org.apache.felix.shell.ShellService, org.ungoverned.osgi.service.shell.ShellService</Export-Service>
             <Import-Service>org.osgi.service.startlevel.StartLevel, org.osgi.service.packageadmin.PackageAdmin</Import-Service>
           </instructions>
diff --git a/upnp/basedriver/pom.xml b/upnp/basedriver/pom.xml
index b833689..86ffdec 100644
--- a/upnp/basedriver/pom.xml
+++ b/upnp/basedriver/pom.xml
@@ -67,9 +67,7 @@
             <Bundle-Activator>
               org.apache.felix.upnp.basedriver.Activator
             </Bundle-Activator>
-            <Bundle-Vendor>
-              Apache Software Foundation
-            </Bundle-Vendor>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Bundle-Author>
               <![CDATA[Matteo Demuru <demuru@apache.org>,Francesco Furfari <furfari@apache.org>,Stefano "Kismet" Lenzi <lenzi@apache.org>]]>
             </Bundle-Author>
diff --git a/upnp/extra/pom.xml b/upnp/extra/pom.xml
index 53a4ae3..60918d8 100644
--- a/upnp/extra/pom.xml
+++ b/upnp/extra/pom.xml
@@ -49,7 +49,7 @@
         <configuration>
           <instructions>
             <Bundle-Name>${pom.name}</Bundle-Name>
-            <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Bundle-Author><![CDATA[Matteo Demuru <demuru@apache.org>,Francesco Furfari <furfari@apache.org>,Stefano "Kismet" Lenzi <lenzi@apache.org>]]></Bundle-Author>
             <Bundle-Description>
                	A library used to extend the integration between UPnP and OSGi that is not part of the standard. Also services that allow to change the beahviour of the UPnP Base Driver
diff --git a/upnp/samples/binarylight/pom.xml b/upnp/samples/binarylight/pom.xml
index df2e762..05279d2 100644
--- a/upnp/samples/binarylight/pom.xml
+++ b/upnp/samples/binarylight/pom.xml
@@ -40,7 +40,7 @@
         <configuration>
           <instructions>
             <Bundle-Name>${pom.name}</Bundle-Name>
-            <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Bundle-Author>Matteo Demuru &lt;demuru@apache.org&gt;,Francesco Furfari &lt;furfari@apache.org&gt;,Stefano "Kismet" Lenzi &lt;lenzi@apache.org&gt;</Bundle-Author>
             <Bundle-Description>Standardized BinaryLight DCPs to test UPnP Base Driver</Bundle-Description>
             <Bundle-SymbolicName>org.apache.felix.upnp.sample.binaryLight</Bundle-SymbolicName>
diff --git a/upnp/samples/clock/pom.xml b/upnp/samples/clock/pom.xml
index 0f3e25b..cdbbdb3 100644
--- a/upnp/samples/clock/pom.xml
+++ b/upnp/samples/clock/pom.xml
@@ -40,7 +40,7 @@
         <configuration>
           <instructions>
             <Bundle-Name>${pom.name}</Bundle-Name>
-            <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Bundle-Author>Matteo Demuru &lt;demuru@apache.org&gt;,Francesco Furfari &lt;furfari@apache.org&gt;,Stefano "Kismet" Lenzi &lt;lenzi@apache.org&gt;</Bundle-Author>
             <Bundle-Description>CyberLink Clock clone to test UPnPBase driver</Bundle-Description>
             <Bundle-SymbolicName>org.apache.felix.upnp.sample.clock</Bundle-SymbolicName>
diff --git a/upnp/samples/tv/pom.xml b/upnp/samples/tv/pom.xml
index 81ba75d..8e546c9 100644
--- a/upnp/samples/tv/pom.xml
+++ b/upnp/samples/tv/pom.xml
@@ -40,7 +40,7 @@
         <configuration>
           <instructions>
             <Bundle-Name>${pom.name}</Bundle-Name>
-            <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Bundle-Author>Matteo Demuru &lt;demuru@apache.org&gt;,Francesco Furfari &lt;furfari@apache.org&gt;,Stefano "Kismet" Lenzi &lt;lenzi@apache.org&gt;</Bundle-Author>
             <Bundle-Description>CyberLink Tv clone to test UPnPBase driver</Bundle-Description>
             <Bundle-SymbolicName>org.apache.felix.upnp.sample.tv</Bundle-SymbolicName>
diff --git a/upnp/tester/pom.xml b/upnp/tester/pom.xml
index aff1545..8452770 100644
--- a/upnp/tester/pom.xml
+++ b/upnp/tester/pom.xml
@@ -40,7 +40,7 @@
         <configuration>
           <instructions>
             <Bundle-Name>${pom.name}</Bundle-Name>
-            <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Bundle-Author><![CDATA[Matteo Demuru <demuru@apache.org>,Francesco Furfari <furfari@apache.org>,Stefano "Kismet" Lenzi <lenzi@apache.org>]]></Bundle-Author>
             <Bundle-Description>
                	OSGi Generic Control Point to control UPnPDevice services
diff --git a/wireadmin/pom.xml b/wireadmin/pom.xml
index a653f34..b0ab710 100644
--- a/wireadmin/pom.xml
+++ b/wireadmin/pom.xml
@@ -52,7 +52,7 @@
         <configuration>
           <instructions>
             <Bundle-Name>WireAdmin</Bundle-Name>
-            <Bundle-Vendor>Apache Felix</Bundle-Vendor>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Bundle-Description>
               Implementation of the WireAdmin Service.
             </Bundle-Description>