diff --git a/ChangeLog b/ChangeLog
index 7f41328..47a2aef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 Version 1.4.7
 *******************************************************************************
 
+2007-05-24 Nektarios K. Papadopoulos <npapadop(at)inaccessnetworks.com>
+	* Added tvcombo sample that demonstrates coexistence of a device and a
+	control point in the same application.
+
 2007-05-24 Nektarios K. Papadopoulos <npapadop(at)inaccessnetworks.com>
 	* SF Tracker FR [ 1570020 ].
 	* Enable both device and control point in the same application. Resolve
diff --git a/upnp/sample/Makefile.am b/upnp/sample/Makefile.am
index 9f43084..75fad68 100644
--- a/upnp/sample/Makefile.am
+++ b/upnp/sample/Makefile.am
@@ -31,6 +31,7 @@ upnp_tv_ctrlpt_CPPFLAGS = \
 if ENABLE_DEVICE
 noinst_PROGRAMS += upnp_tv_combo
 upnp_tv_combo_CPPFLAGS = $(AM_CPPFLAGS) \
+	-I$(srcdir)/common/ \
 	-I$(srcdir)/tvcombo
 endif
 endif
diff --git a/upnp/sample/web/tvcombodesc.xml b/upnp/sample/web/tvcombodesc.xml
index e14d854..3ffe57c 100644
--- a/upnp/sample/web/tvcombodesc.xml
+++ b/upnp/sample/web/tvcombodesc.xml
@@ -14,7 +14,7 @@
     <modelNumber>1.0</modelNumber>
     <modelURL>http://www.manufacturer.com/TVEmulator/</modelURL>
     <serialNumber>123456789001</serialNumber>
-    <UDN>uuid:Upnp-TVEmulator-1_0-1234567890001</UDN>
+    <UDN>uuid:Upnp-TVEmulator-1_0-1234567890002</UDN>
     <UPC>123456789</UPC>
     <serviceList>
       <service>