diff --git a/router/java/src/org/cybergarage/http/HTTPPacket.java b/router/java/src/org/cybergarage/http/HTTPPacket.java
index 76ed7dac818ae604cb1b87385525dfcf9f69af9e..5c2b8395a346a176cce3433df392f46161f601bc 100644
--- a/router/java/src/org/cybergarage/http/HTTPPacket.java
+++ b/router/java/src/org/cybergarage/http/HTTPPacket.java
@@ -834,6 +834,7 @@ public class HTTPPacket
 		setHeader(HTTP.HOST, hostAddr + ":" + Integer.toString(port));
 	}
 
+/*  I2P No - we always want port also. libupnp-based devices will reject 403 without the port
 	public void setHost(String host)
 	{
 		String hostAddr = host;
@@ -841,6 +842,7 @@ public class HTTPPacket
 			hostAddr = "[" + host + "]";
 		setHeader(HTTP.HOST, hostAddr);
 	}
+*/
 	
 	public String getHost()
 	{
diff --git a/router/java/src/org/cybergarage/http/HTTPRequest.java b/router/java/src/org/cybergarage/http/HTTPRequest.java
index 6b9c850b28409e6253ce93555b47d63a7c4762bd..7f9610094082fdab68958436b5bda35f7906a223 100644
--- a/router/java/src/org/cybergarage/http/HTTPRequest.java
+++ b/router/java/src/org/cybergarage/http/HTTPRequest.java
@@ -402,7 +402,7 @@ public class HTTPRequest extends HTTPPacket
 	{
 		HTTPResponse httpRes = new HTTPResponse();
 
-		setHost(host);
+		setHost(host, port);
 		
 		setConnection((isKeepAlive == true) ? HTTP.KEEP_ALIVE : HTTP.CLOSE);