diff --git a/bundlerepository/pom.xml b/bundlerepository/pom.xml
index f8187a5..6ac4e85 100644
--- a/bundlerepository/pom.xml
+++ b/bundlerepository/pom.xml
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
 <project>
   <parent>
     <groupId>org.apache.felix</groupId>
diff --git a/bundlerepository/src/main/resources/NOTICE b/bundlerepository/src/main/resources/NOTICE
index a95f7d0..ee543e8 100644
--- a/bundlerepository/src/main/resources/NOTICE
+++ b/bundlerepository/src/main/resources/NOTICE
@@ -1,6 +1,16 @@
 Apache Felix OSGi Bundle Repository
 Copyright 2006 The Apache Software Foundation
 
+Apache Felix is an effort undergoing incubation at 
+The Apache Software Foundation (ASF). Incubation is 
+required of all newly accepted projects until a further 
+review indicates that the infrastructure, communications, 
+and decision making process have stabilized in a manner 
+consistent with other successful ASF projects. While 
+incubation status is not necessarily a reflection of the 
+completeness or stability of the code, it does indicate 
+that the project has yet to be fully endorsed by the ASF.
+
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
diff --git a/eventadmin.bridge.configuration/src/main/resources/NOTICE b/eventadmin.bridge.configuration/src/main/resources/NOTICE
index 68f6aaf..a851728 100644
--- a/eventadmin.bridge.configuration/src/main/resources/NOTICE
+++ b/eventadmin.bridge.configuration/src/main/resources/NOTICE
@@ -1,5 +1,15 @@
 Apache Felix EventAdmin Bridge Configuration
 Copyright 2006 The Apache Software Foundation
 
+Apache Felix is an effort undergoing incubation at 
+The Apache Software Foundation (ASF). Incubation is 
+required of all newly accepted projects until a further 
+review indicates that the infrastructure, communications, 
+and decision making process have stabilized in a manner 
+consistent with other successful ASF projects. While 
+incubation status is not necessarily a reflection of the 
+completeness or stability of the code, it does indicate 
+that the project has yet to be fully endorsed by the ASF.
+
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/eventadmin.bridge.upnp/src/main/resources/NOTICE b/eventadmin.bridge.upnp/src/main/resources/NOTICE
index 0a9e37c..97915dd 100644
--- a/eventadmin.bridge.upnp/src/main/resources/NOTICE
+++ b/eventadmin.bridge.upnp/src/main/resources/NOTICE
@@ -1,5 +1,15 @@
 Apache Felix EventAdmin Bridge UPnP
 Copyright 2006 The Apache Software Foundation
 
+Apache Felix is an effort undergoing incubation at 
+The Apache Software Foundation (ASF). Incubation is 
+required of all newly accepted projects until a further 
+review indicates that the infrastructure, communications, 
+and decision making process have stabilized in a manner 
+consistent with other successful ASF projects. While 
+incubation status is not necessarily a reflection of the 
+completeness or stability of the code, it does indicate 
+that the project has yet to be fully endorsed by the ASF.
+
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/eventadmin.bridge.useradmin/src/main/resources/NOTICE b/eventadmin.bridge.useradmin/src/main/resources/NOTICE
index e768817..4d3a585 100644
--- a/eventadmin.bridge.useradmin/src/main/resources/NOTICE
+++ b/eventadmin.bridge.useradmin/src/main/resources/NOTICE
@@ -1,5 +1,15 @@
 Apache Felix EventAdmin Bridge UserAdmin
 Copyright 2006 The Apache Software Foundation
 
+Apache Felix is an effort undergoing incubation at 
+The Apache Software Foundation (ASF). Incubation is 
+required of all newly accepted projects until a further 
+review indicates that the infrastructure, communications, 
+and decision making process have stabilized in a manner 
+consistent with other successful ASF projects. While 
+incubation status is not necessarily a reflection of the 
+completeness or stability of the code, it does indicate 
+that the project has yet to be fully endorsed by the ASF.
+
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/eventadmin.bridge.wireadmin/src/main/resources/NOTICE b/eventadmin.bridge.wireadmin/src/main/resources/NOTICE
index 6ea3c11..a8b915c 100644
--- a/eventadmin.bridge.wireadmin/src/main/resources/NOTICE
+++ b/eventadmin.bridge.wireadmin/src/main/resources/NOTICE
@@ -1,5 +1,15 @@
 Apache Felix EventAdmin Bridge WireAdmin
 Copyright 2006 The Apache Software Foundation
 
+Apache Felix is an effort undergoing incubation at 
+The Apache Software Foundation (ASF). Incubation is 
+required of all newly accepted projects until a further 
+review indicates that the infrastructure, communications, 
+and decision making process have stabilized in a manner 
+consistent with other successful ASF projects. While 
+incubation status is not necessarily a reflection of the 
+completeness or stability of the code, it does indicate 
+that the project has yet to be fully endorsed by the ASF.
+
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/eventadmin/src/main/resources/NOTICE b/eventadmin/src/main/resources/NOTICE
index e49c0a8..428dd33 100644
--- a/eventadmin/src/main/resources/NOTICE
+++ b/eventadmin/src/main/resources/NOTICE
@@ -1,5 +1,15 @@
 Apache Felix EventAdmin
 Copyright 2006 The Apache Software Foundation
 
+Apache Felix is an effort undergoing incubation at 
+The Apache Software Foundation (ASF). Incubation is 
+required of all newly accepted projects until a further 
+review indicates that the infrastructure, communications, 
+and decision making process have stabilized in a manner 
+consistent with other successful ASF projects. While 
+incubation status is not necessarily a reflection of the 
+completeness or stability of the code, it does indicate 
+that the project has yet to be fully endorsed by the ASF.
+
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/examples/simple/NOTICE b/examples/simple/NOTICE
index c80cf6c..a35987b 100644
--- a/examples/simple/NOTICE
+++ b/examples/simple/NOTICE
@@ -1,5 +1,15 @@
 Apache Felix Simple Bundle
 Copyright 2006 The Apache Software Foundation
 
+Apache Felix is an effort undergoing incubation at 
+The Apache Software Foundation (ASF). Incubation is 
+required of all newly accepted projects until a further 
+review indicates that the infrastructure, communications, 
+and decision making process have stabilized in a manner 
+consistent with other successful ASF projects. While 
+incubation status is not necessarily a reflection of the 
+completeness or stability of the code, it does indicate 
+that the project has yet to be fully endorsed by the ASF.
+
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/framework/etc/all.policy b/framework/etc/all.policy
index dc85222..3511a6c 100644
--- a/framework/etc/all.policy
+++ b/framework/etc/all.policy
@@ -1,3 +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
+#
+#   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.
+
 grant {
   permission java.security.AllPermission;
 };
diff --git a/framework/etc/config.properties.gui b/framework/etc/config.properties.gui
index fb62d12..bcf5158 100644
--- a/framework/etc/config.properties.gui
+++ b/framework/etc/config.properties.gui
@@ -1,3 +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
+#
+#   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.
+
 felix.auto.start.1=file:bundle/shell.jar file:bundle/tablelayout.jar \
     file:bundle/shellgui.jar file:bundle/shellplugin.jar \
     file:bundle/bundlerepository.jar
diff --git a/framework/etc/config.properties.text b/framework/etc/config.properties.text
index 0486a4d..19a2976 100644
--- a/framework/etc/config.properties.text
+++ b/framework/etc/config.properties.text
@@ -1,3 +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
+#
+#   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.
+
 felix.auto.start.1=file:bundle/shell.jar file:bundle/shelltui.jar \
     file:bundle/bundlerepository.jar
 
diff --git a/framework/etc/example.policy b/framework/etc/example.policy
index 961318a..1c8a7cf 100644
--- a/framework/etc/example.policy
+++ b/framework/etc/example.policy
@@ -1,3 +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
+#
+#   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.
+
 grant codeBase "file:bundle/shellgui.jar" {
   permission org.osgi.framework.ServicePermission "org.ungoverned.osgi.bundle.shellgui.Plugin", "get";
 };
diff --git a/framework/etc/felix.bat b/framework/etc/felix.bat
index ed82503..2fd52ef 100644
--- a/framework/etc/felix.bat
+++ b/framework/etc/felix.bat
@@ -1,16 +1,33 @@
-@echo off
-
-rem
-rem The following 'set' command should be automatically
-rem assigned during install, if not, edit it to reflect
-rem your Java installation.
-rem
-
-set JAVA_HOME="%%Java directory%%"
-
-rem
-rem You do not need to edit the following.
-rem
-
-%JAVA_HOME%\bin\java -jar lib\felix.jar
-
+@echo off
+
+rem Licensed to the Apache Software Foundation (ASF) under one
+rem or more contributor license agreements.  See the NOTICE file
+rem distributed with this work for additional information
+rem regarding copyright ownership.  The ASF licenses this file
+rem to you under the Apache License, Version 2.0 (the
+rem "License"); you may not use this file except in compliance
+rem with the License.  You may obtain a copy of the License at
+rem
+rem   http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing,
+rem software distributed under the License is distributed on an
+rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+rem KIND, either express or implied.  See the License for the
+rem specific language governing permissions and limitations
+rem under the License.
+
+rem
+rem The following 'set' command should be automatically
+rem assigned during install, if not, edit it to reflect
+rem your Java installation.
+rem
+
+set JAVA_HOME="%%Java directory%%"
+
+rem
+rem You do not need to edit the following.
+rem
+
+%JAVA_HOME%\bin\java -jar lib\felix.jar
+
diff --git a/framework/etc/felix.sh b/framework/etc/felix.sh
index 9ec3e09..b71d4de 100644
--- a/framework/etc/felix.sh
+++ b/framework/etc/felix.sh
@@ -1,5 +1,22 @@
 #!/bin/sh
 
+# 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.
+
 #
 # The following variable should be automatically
 # assigned during install, if not, edit it to reflect
diff --git a/framework/pom.xml b/framework/pom.xml
index 268f5fd..4a21c7b 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
 <project>
   <parent>
     <groupId>org.apache.felix</groupId>
diff --git a/framework/src/main/java/org/apache/felix/framework/Felix.java b/framework/src/main/java/org/apache/felix/framework/Felix.java
index f64a2ab..f8c8e1d 100644
--- a/framework/src/main/java/org/apache/felix/framework/Felix.java
+++ b/framework/src/main/java/org/apache/felix/framework/Felix.java
@@ -20,7 +20,6 @@
 
 import java.io.*;
 import java.net.URL;
-import java.net.URLConnection;
 import java.net.URLStreamHandler;
 import java.security.CodeSource;
 import java.security.ProtectionDomain;
diff --git a/framework/src/main/resources/NOTICE b/framework/src/main/resources/NOTICE
index d686177..ef7a957 100644
--- a/framework/src/main/resources/NOTICE
+++ b/framework/src/main/resources/NOTICE
@@ -1,5 +1,15 @@
 Apache Felix Framework
 Copyright 2006 The Apache Software Foundation
 
+Apache Felix is an effort undergoing incubation at 
+The Apache Software Foundation (ASF). Incubation is 
+required of all newly accepted projects until a further 
+review indicates that the infrastructure, communications, 
+and decision making process have stabilized in a manner 
+consistent with other successful ASF projects. While 
+incubation status is not necessarily a reflection of the 
+completeness or stability of the code, it does indicate 
+that the project has yet to be fully endorsed by the ASF.
+
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/log/src/main/resources/NOTICE b/log/src/main/resources/NOTICE
index 553560a..3e14a70 100644
--- a/log/src/main/resources/NOTICE
+++ b/log/src/main/resources/NOTICE
@@ -1,5 +1,15 @@
 Apache Felix Log Service
 Copyright 2006 The Apache Software Foundation
 
+Apache Felix is an effort undergoing incubation at 
+The Apache Software Foundation (ASF). Incubation is 
+required of all newly accepted projects until a further 
+review indicates that the infrastructure, communications, 
+and decision making process have stabilized in a manner 
+consistent with other successful ASF projects. While 
+incubation status is not necessarily a reflection of the 
+completeness or stability of the code, it does indicate 
+that the project has yet to be fully endorsed by the ASF.
+
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/main/pom.xml b/main/pom.xml
index d49ada8..67eb626 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
 <project>
  <parent>
     <groupId>org.apache.felix</groupId>
diff --git a/main/src/main/resources/NOTICE b/main/src/main/resources/NOTICE
index 2c71d10..c0a71b1 100644
--- a/main/src/main/resources/NOTICE
+++ b/main/src/main/resources/NOTICE
@@ -1,5 +1,15 @@
 Apache Felix Main
 Copyright 2006 The Apache Software Foundation
 
+Apache Felix is an effort undergoing incubation at 
+The Apache Software Foundation (ASF). Incubation is 
+required of all newly accepted projects until a further 
+review indicates that the infrastructure, communications, 
+and decision making process have stabilized in a manner 
+consistent with other successful ASF projects. While 
+incubation status is not necessarily a reflection of the 
+completeness or stability of the code, it does indicate 
+that the project has yet to be fully endorsed by the ASF.
+
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/main/src/main/resources/config.properties b/main/src/main/resources/config.properties
index 74ad438..c9bae94 100644
--- a/main/src/main/resources/config.properties
+++ b/main/src/main/resources/config.properties
@@ -1,3 +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
+#
+#   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.
+
 #
 # Framework config properties.
 #
diff --git a/org.osgi.core/pom.xml b/org.osgi.core/pom.xml
index 5d9c29c..be3f426 100644
--- a/org.osgi.core/pom.xml
+++ b/org.osgi.core/pom.xml
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
 <project>
   <parent>
     <groupId>org.apache.felix</groupId>
diff --git a/pom.xml b/pom.xml
index b505028..5296599 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,3 +1,21 @@
+<!-- 
+ 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. 
+-->
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.felix</groupId>
diff --git a/shell.tui/pom.xml b/shell.tui/pom.xml
index dc095e4..4ef4d1b 100644
--- a/shell.tui/pom.xml
+++ b/shell.tui/pom.xml
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
 <project>
   <parent>
     <groupId>org.apache.felix</groupId>
diff --git a/shell.tui/src/main/resources/NOTICE b/shell.tui/src/main/resources/NOTICE
index e2a5fe8..ef2c9d9 100644
--- a/shell.tui/src/main/resources/NOTICE
+++ b/shell.tui/src/main/resources/NOTICE
@@ -1,5 +1,15 @@
 Apache Felix Shell Textual Interface
 Copyright 2006 The Apache Software Foundation
 
+Apache Felix is an effort undergoing incubation at 
+The Apache Software Foundation (ASF). Incubation is 
+required of all newly accepted projects until a further 
+review indicates that the infrastructure, communications, 
+and decision making process have stabilized in a manner 
+consistent with other successful ASF projects. While 
+incubation status is not necessarily a reflection of the 
+completeness or stability of the code, it does indicate 
+that the project has yet to be fully endorsed by the ASF.
+
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/shell/pom.xml b/shell/pom.xml
index 0b5d6f8..08b5493 100644
--- a/shell/pom.xml
+++ b/shell/pom.xml
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
 <project>
   <parent>
     <groupId>org.apache.felix</groupId>
diff --git a/shell/src/main/resources/NOTICE b/shell/src/main/resources/NOTICE
index 459d669..5bbb0e7 100644
--- a/shell/src/main/resources/NOTICE
+++ b/shell/src/main/resources/NOTICE
@@ -1,5 +1,15 @@
 Apache Felix Shell Service
 Copyright 2006 The Apache Software Foundation
 
+Apache Felix is an effort undergoing incubation at 
+The Apache Software Foundation (ASF). Incubation is 
+required of all newly accepted projects until a further 
+review indicates that the infrastructure, communications, 
+and decision making process have stabilized in a manner 
+consistent with other successful ASF projects. While 
+incubation status is not necessarily a reflection of the 
+completeness or stability of the code, it does indicate 
+that the project has yet to be fully endorsed by the ASF.
+
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/tools/maven2/maven-osgi-plugin/pom.xml b/tools/maven2/maven-osgi-plugin/pom.xml
index ba33371..3d5299c 100644
--- a/tools/maven2/maven-osgi-plugin/pom.xml
+++ b/tools/maven2/maven-osgi-plugin/pom.xml
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
 <project>
   <parent>
     <artifactId>felix</artifactId>
diff --git a/tools/maven2/maven-osgi-plugin/src/main/resources/META-INF/plexus/components.xml b/tools/maven2/maven-osgi-plugin/src/main/resources/META-INF/plexus/components.xml
index 077b15b..4bcab94 100644
--- a/tools/maven2/maven-osgi-plugin/src/main/resources/META-INF/plexus/components.xml
+++ b/tools/maven2/maven-osgi-plugin/src/main/resources/META-INF/plexus/components.xml
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
 <component-set>
   <components>
     <component>