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