diff --git a/ChangeLog b/ChangeLog
index 0380da918..8ef0616b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,7 @@
 	  incoming connection
 	* added more detailed instrumentation of the disk I/O thread
 
+	* fixed UPnP DeletePortmapping issue
 	* fixed NAT-PMP issue when adding the same mapping multiple times
 	* no peers from tracker when stopping is no longer an error
 	* improved web seed retry behavior
diff --git a/src/upnp.cpp b/src/upnp.cpp
index 853d5b3c1..e5e5c5001 100644
--- a/src/upnp.cpp
+++ b/src/upnp.cpp
@@ -736,6 +736,7 @@ void upnp::delete_port_mapping(rootdevice& d, int i)
 		"<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\" "
 		"s:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">"
 		"<s:Body><u:%s xmlns:u=\"%s\">"
+		"<NewRemoteHost></NewRemoteHost>"
 		"<NewExternalPort>%u</NewExternalPort>"
 		"<NewProtocol>%s</NewProtocol>"
 		"</u:%s></s:Body></s:Envelope>"
@@ -1253,7 +1254,7 @@ void upnp::on_upnp_unmap_response(error_code const& e
 	}
 	else
 	{
-		char msg[200];
+		char msg[500];
 		snprintf(msg, sizeof(msg), "unmap response: %s"
 			, std::string(p.get_body().begin, p.get_body().end).c_str());
 		log(msg, l);