diff --git a/ChangeLog b/ChangeLog
index 881e077..6f65f5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -255,6 +255,12 @@ Version 1.8.0
 Version 1.6.16
 *******************************************************************************
 
+2012-02-07 Edwin Stearns <edwin(at)vtilt.com>
+
+	Attached is a patch that resolved an issue I found with a server that
+	gave its device description URI without a trailing slash (e.g.
+	`http://127.0.0.1:5555`).
+
 2012-01-04 Fabrice Fontaine <fabrice.fontaine(at)orange.com>
 
 	Bug fix for IPv4-mapped IPv6 addresses.
diff --git a/upnp/src/genlib/net/http/httpreadwrite.c b/upnp/src/genlib/net/http/httpreadwrite.c
index 22d7570..fdbaa6e 100644
--- a/upnp/src/genlib/net/http/httpreadwrite.c
+++ b/upnp/src/genlib/net/http/httpreadwrite.c
@@ -641,11 +641,13 @@ int http_Download( IN const char *url_str,
 		return UPNP_E_INVALID_URL;
 	hoststr += 2;
 	temp = strchr(hoststr, '/');
-	if (temp == NULL)
-		return UPNP_E_INVALID_URL;
-	*temp = '\0';
-	hostlen = strlen(hoststr);
-	*temp = '/';
+	if (temp) {
+		*temp = '\0';
+		hostlen = strlen(hoststr);
+		*temp = '/';
+	} else {
+		hostlen = strlen(hoststr);
+	}
 	UpnpPrintf(UPNP_INFO, HTTP, __FILE__, __LINE__,
 		   "HOSTNAME : %s Length : %" PRIzu "\n", hoststr, hostlen);
 	ret_code = http_MakeMessage(&request, 1, 1,