diff --git a/ChangeLog b/ChangeLog
index b04afe8..1cdf8b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 Version 1.6.6
 *******************************************************************************
 
+2008-02-22 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* No longer ignore "upnp:rootdevice" advertisement. Thanks to Bob Ciora.
+
 2008-02-10 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
 	* Changed "sys_errlist[errno]", which is deprecated, by
 	"strerror_r()", which is thread safe.
diff --git a/upnp/src/ssdp/ssdp_server.c b/upnp/src/ssdp/ssdp_server.c
index d3667ea..50f37e4 100644
--- a/upnp/src/ssdp/ssdp_server.c
+++ b/upnp/src/ssdp/ssdp_server.c
@@ -442,20 +442,18 @@ Make_Socket_NoBlocking( int sock )
  * Returns: int
  *	0 if successful else -1
  ***************************************************************************/
-int
-unique_service_name( IN char *cmd,
-                     IN SsdpEvent * Evt )
+int unique_service_name(IN char *cmd, IN SsdpEvent *Evt)
 {
-    char *TempPtr,
-      TempBuf[COMMAND_LEN],
-     *Ptr,
-     *ptr1,
-     *ptr2,
-     *ptr3;
+    char TempBuf[COMMAND_LEN];
+    char *TempPtr = NULL;
+    char *Ptr = NULL;
+    char *ptr1 = NULL;
+    char *ptr2 = NULL;
+    char *ptr3 = NULL;
     int CommandFound = 0;
+    int length = 0;
 
     if( ( TempPtr = strstr( cmd, "uuid:schemas" ) ) != NULL ) {
-
         ptr1 = strstr( cmd, ":device" );
         if( ptr1 != NULL ) {
             ptr2 = strstr( ptr1 + 1, ":" );
@@ -487,7 +485,6 @@ unique_service_name( IN char *cmd,
     }
 
     if( ( TempPtr = strstr( cmd, "uuid" ) ) != NULL ) {
-        //printf("cmd = %s\n",cmd);
         if( ( Ptr = strstr( cmd, "::" ) ) != NULL ) {
             strncpy( Evt->UDN, TempPtr, Ptr - TempPtr );
             Evt->UDN[Ptr - TempPtr] = '\0';
@@ -499,7 +496,6 @@ unique_service_name( IN char *cmd,
 
     if( strstr( cmd, "urn:" ) != NULL
         && strstr( cmd, ":service:" ) != NULL ) {
-
         if( ( TempPtr = strstr( cmd, "urn" ) ) != NULL ) {
             strcpy( Evt->ServiceType, TempPtr );
             CommandFound = 1;
@@ -514,8 +510,17 @@ unique_service_name( IN char *cmd,
         }
     }
 
+    if( ( TempPtr = strstr( cmd, "::upnp:rootdevice" ) ) != NULL ) {
+        /* Everything before "::upnp::rootdevice" is the UDN. */
+        if( TempPtr != cmd ) {
+            length = TempPtr - cmd;
+            strncpy(Evt->UDN, cmd, length);
+            Evt->UDN[length] = 0;
+            CommandFound = 1;
+        }
+    }
+   
     if( CommandFound == 0 ) {
-
         return -1;
     }