diff --git a/http/api/DEPENDENCIES b/http/api/DEPENDENCIES
new file mode 100644
index 0000000..7167c29
--- /dev/null
+++ b/http/api/DEPENDENCIES
@@ -0,0 +1,22 @@
+Apache Felix Http Service Api
+Copyright 2011 The Apache Software Foundation
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+III. License Summary
+- Apache License 2.0
diff --git a/http/api/NOTICE b/http/api/NOTICE
index 9abd704..591b905 100644
--- a/http/api/NOTICE
+++ b/http/api/NOTICE
@@ -1,22 +1,6 @@
 Apache Felix Http Service Api
 Copyright 2011 The Apache Software Foundation
 
-I. Included Software
-
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
-
-II. Used Software
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org).
-Copyright (c) OSGi Alliance (2000, 2007).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-III. License Summary
-- Apache License 2.0
diff --git a/http/base/DEPENDENCIES b/http/base/DEPENDENCIES
new file mode 100644
index 0000000..56da41b
--- /dev/null
+++ b/http/base/DEPENDENCIES
@@ -0,0 +1,22 @@
+Apache Felix Http Service Base
+Copyright 2011 The Apache Software Foundation
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+III. License Summary
+- Apache License 2.0
diff --git a/http/base/NOTICE b/http/base/NOTICE
index a6ee007..e4a7405 100644
--- a/http/base/NOTICE
+++ b/http/base/NOTICE
@@ -1,22 +1,6 @@
 Apache Felix Http Service Base
 Copyright 2011 The Apache Software Foundation
 
-I. Included Software
-
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
-
-II. Used Software
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org).
-Copyright (c) OSGi Alliance (2000, 2007).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-III. License Summary
-- Apache License 2.0
diff --git a/http/bridge/DEPENDENCIES b/http/bridge/DEPENDENCIES
new file mode 100644
index 0000000..49a913d
--- /dev/null
+++ b/http/bridge/DEPENDENCIES
@@ -0,0 +1,27 @@
+Apache Felix Http Service Bridge
+Copyright 2011 The Apache Software Foundation
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+III. License Summary
+- Apache License 2.0
diff --git a/http/bridge/NOTICE b/http/bridge/NOTICE
index cd568d5..843b5a4 100644
--- a/http/bridge/NOTICE
+++ b/http/bridge/NOTICE
@@ -1,27 +1,11 @@
 Apache Felix Http Service Bridge
 Copyright 2011 The Apache Software Foundation
 
-I. Included Software
-
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
 
 This product includes software developed at
 The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
+Copyright (c) OSGi Alliance (2000, 2009).
 Licensed under the Apache License 2.0.
-
-II. Used Software
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org).
-Copyright (c) OSGi Alliance (2000, 2007).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-III. License Summary
-- Apache License 2.0
diff --git a/http/bundle/DEPENDENCIES b/http/bundle/DEPENDENCIES
new file mode 100644
index 0000000..a6bd379
--- /dev/null
+++ b/http/bundle/DEPENDENCIES
@@ -0,0 +1,31 @@
+Apache Felix Http Service Bundle
+Copyright 2011 The Apache Software Foundation
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed by
+Mortbay (http://mortbay.org)
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+III. License Summary
+- Apache License 2.0
diff --git a/http/bundle/NOTICE b/http/bundle/NOTICE
index 127b2cc..7140e41 100644
--- a/http/bundle/NOTICE
+++ b/http/bundle/NOTICE
@@ -1,8 +1,6 @@
 Apache Felix Http Service Bundle
 Copyright 2011 The Apache Software Foundation
 
-I. Included Software
-
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
@@ -13,19 +11,5 @@
 
 This product includes software developed at
 The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
+Copyright (c) OSGi Alliance (2000, 2009).
 Licensed under the Apache License 2.0.
-
-II. Used Software
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org).
-Copyright (c) OSGi Alliance (2000, 2007).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-III. License Summary
-- Apache License 2.0
diff --git a/http/jetty/DEPENDENCIES b/http/jetty/DEPENDENCIES
new file mode 100644
index 0000000..9136c35
--- /dev/null
+++ b/http/jetty/DEPENDENCIES
@@ -0,0 +1,31 @@
+Apache Felix Http Service Jetty
+Copyright 2011 The Apache Software Foundation
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed by
+Mortbay (http://mortbay.org)
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+III. License Summary
+- Apache License 2.0
diff --git a/http/jetty/NOTICE b/http/jetty/NOTICE
index 40533fa..f90035c 100644
--- a/http/jetty/NOTICE
+++ b/http/jetty/NOTICE
@@ -1,8 +1,6 @@
 Apache Felix Http Service Jetty
 Copyright 2011 The Apache Software Foundation
 
-I. Included Software
-
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
@@ -13,19 +11,5 @@
 
 This product includes software developed at
 The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
+Copyright (c) OSGi Alliance (2000, 2009).
 Licensed under the Apache License 2.0.
-
-II. Used Software
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org).
-Copyright (c) OSGi Alliance (2000, 2007).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-III. License Summary
-- Apache License 2.0
diff --git a/http/proxy/DEPENDENCIES b/http/proxy/DEPENDENCIES
new file mode 100644
index 0000000..937b237
--- /dev/null
+++ b/http/proxy/DEPENDENCIES
@@ -0,0 +1,22 @@
+Apache Felix Http Service Proxy
+Copyright 2011 The Apache Software Foundation
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+III. License Summary
+- Apache License 2.0
diff --git a/http/proxy/NOTICE b/http/proxy/NOTICE
index 5cb08fe..1105922 100644
--- a/http/proxy/NOTICE
+++ b/http/proxy/NOTICE
@@ -1,22 +1,6 @@
 Apache Felix Http Service Proxy
 Copyright 2011 The Apache Software Foundation
 
-I. Included Software
-
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
-
-II. Used Software
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org).
-Copyright (c) OSGi Alliance (2000, 2007).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-III. License Summary
-- Apache License 2.0
diff --git a/http/samples/bridge/DEPENDENCIES b/http/samples/bridge/DEPENDENCIES
new file mode 100644
index 0000000..e65dc7e
--- /dev/null
+++ b/http/samples/bridge/DEPENDENCIES
@@ -0,0 +1,27 @@
+Apache Felix Http Service Bridge Sample
+Copyright 2011 The Apache Software Foundation
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+III. License Summary
+- Apache License 2.0
diff --git a/http/samples/bridge/NOTICE b/http/samples/bridge/NOTICE
index 8f1356f..514604d 100644
--- a/http/samples/bridge/NOTICE
+++ b/http/samples/bridge/NOTICE
@@ -1,27 +1,11 @@
 Apache Felix Http Service Bridge Sample
 Copyright 2011 The Apache Software Foundation
 
-I. Included Software
-
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
 
 This product includes software developed at
 The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
+Copyright (c) OSGi Alliance (2000, 2009).
 Licensed under the Apache License 2.0.
-
-II. Used Software
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org).
-Copyright (c) OSGi Alliance (2000, 2007).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-III. License Summary
-- Apache License 2.0
diff --git a/http/samples/filter/DEPENDENCIES b/http/samples/filter/DEPENDENCIES
new file mode 100644
index 0000000..05a2594
--- /dev/null
+++ b/http/samples/filter/DEPENDENCIES
@@ -0,0 +1,22 @@
+Apache Felix Http Service Filter Sample
+Copyright 2011 The Apache Software Foundation
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+III. License Summary
+- Apache License 2.0
diff --git a/http/samples/filter/NOTICE b/http/samples/filter/NOTICE
index d66f1fe..290a6ff 100644
--- a/http/samples/filter/NOTICE
+++ b/http/samples/filter/NOTICE
@@ -1,22 +1,6 @@
 Apache Felix Http Service Filter Sample
 Copyright 2011 The Apache Software Foundation
 
-I. Included Software
-
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
-
-II. Used Software
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org).
-Copyright (c) OSGi Alliance (2000, 2007).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-III. License Summary
-- Apache License 2.0
diff --git a/http/samples/whiteboard/DEPENDENCIES b/http/samples/whiteboard/DEPENDENCIES
new file mode 100644
index 0000000..a3020c1
--- /dev/null
+++ b/http/samples/whiteboard/DEPENDENCIES
@@ -0,0 +1,22 @@
+Apache Felix Http Service Whiteboard Sample
+Copyright 2011 The Apache Software Foundation
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+III. License Summary
+- Apache License 2.0
diff --git a/http/samples/whiteboard/NOTICE b/http/samples/whiteboard/NOTICE
index 18f19aa..443b61a 100644
--- a/http/samples/whiteboard/NOTICE
+++ b/http/samples/whiteboard/NOTICE
@@ -1,22 +1,6 @@
 Apache Felix Http Service Whiteboard Sample
 Copyright 2011 The Apache Software Foundation
 
-I. Included Software
-
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
-
-II. Used Software
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org).
-Copyright (c) OSGi Alliance (2000, 2007).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-III. License Summary
-- Apache License 2.0
diff --git a/http/whiteboard/DEPENDENCIES b/http/whiteboard/DEPENDENCIES
new file mode 100644
index 0000000..34936d2
--- /dev/null
+++ b/http/whiteboard/DEPENDENCIES
@@ -0,0 +1,22 @@
+Apache Felix Http Service Whiteboard
+Copyright 2011 The Apache Software Foundation
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+III. License Summary
+- Apache License 2.0
diff --git a/http/whiteboard/NOTICE b/http/whiteboard/NOTICE
index 287c0c6..6ea038d 100644
--- a/http/whiteboard/NOTICE
+++ b/http/whiteboard/NOTICE
@@ -1,22 +1,6 @@
 Apache Felix Http Service Whiteboard
 Copyright 2011 The Apache Software Foundation
 
-I. Included Software
-
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
-
-II. Used Software
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org).
-Copyright (c) OSGi Alliance (2000, 2007).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-III. License Summary
-- Apache License 2.0