diff --git a/upnp/samples/binarylight/NOTICE b/upnp/samples/binarylight/NOTICE
index 42b1213..b9ec20c 100644
--- a/upnp/samples/binarylight/NOTICE
+++ b/upnp/samples/binarylight/NOTICE
@@ -11,10 +11,6 @@
 II. Used Software
 
 This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
 The OSGi Alliance (http://www.osgi.org/).
 Copyright 2006-2008 The OSGi Alliance.
 Licensed under the Apache License 2.0.
diff --git a/upnp/samples/clock/LICENSE.cgupnpjava b/upnp/samples/clock/LICENSE.cgupnpjava
new file mode 100644
index 0000000..31513dc
--- /dev/null
+++ b/upnp/samples/clock/LICENSE.cgupnpjava
@@ -0,0 +1,25 @@
+Copyright (c) 2003-2008, Satoshi Konno
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer. * Redistributions in
+    binary form must reproduce the above copyright notice, this list of
+    conditions and the following disclaimer in the documentation and/or other
+    materials provided with the distribution. * Neither the name of the
+    Cyberlink nor the names of its contributors may be used to endorse or
+    promote products derived from this software without specific prior written
+    permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/upnp/samples/clock/NOTICE b/upnp/samples/clock/NOTICE
index e652e11..91755b5 100644
--- a/upnp/samples/clock/NOTICE
+++ b/upnp/samples/clock/NOTICE
@@ -16,19 +16,10 @@
 II. Used Software
 
 This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
 The OSGi Alliance (http://www.osgi.org/).
 Copyright 2006-2008 The OSGi Alliance.
 Licensed under the Apache License 2.0.
 
-This product uses software developed by Satoshi Konno
-(http://sourceforge.net/projects/cgupnpjava/)
-Copyright 2003-2008 Satoshi Konno,
-Licensed under the BSD License.
-
 III. License Summary
 - Apache License 2.0
 - BSD License
diff --git a/upnp/samples/tv/LICENSE.cgupnpjava b/upnp/samples/tv/LICENSE.cgupnpjava
new file mode 100644
index 0000000..31513dc
--- /dev/null
+++ b/upnp/samples/tv/LICENSE.cgupnpjava
@@ -0,0 +1,25 @@
+Copyright (c) 2003-2008, Satoshi Konno
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer. * Redistributions in
+    binary form must reproduce the above copyright notice, this list of
+    conditions and the following disclaimer in the documentation and/or other
+    materials provided with the distribution. * Neither the name of the
+    Cyberlink nor the names of its contributors may be used to endorse or
+    promote products derived from this software without specific prior written
+    permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/upnp/samples/tv/NOTICE b/upnp/samples/tv/NOTICE
index e715a11..1633ca2 100644
--- a/upnp/samples/tv/NOTICE
+++ b/upnp/samples/tv/NOTICE
@@ -16,19 +16,10 @@
 II. Used Software
 
 This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
 The OSGi Alliance (http://www.osgi.org/).
 Copyright 2006-2008 The OSGi Alliance.
 Licensed under the Apache License 2.0.
 
-This product uses software developed by Satoshi Konno
-(http://sourceforge.net/projects/cgupnpjava/)
-Copyright 2003-2008 Satoshi Konno,
-Licensed under the BSD License.
-
 III. License Summary
 - Apache License 2.0
 - BSD License