diff --git a/miniupnpd/TODO b/miniupnpd/TODO
index ce7ad24..3e12c63 100644
--- a/miniupnpd/TODO
+++ b/miniupnpd/TODO
@@ -20,3 +20,5 @@ support IGD v2 : http://upnp.org/specs/gw/igd2/
    - ipfw/ipf : TODO
 
 implement port_in_use() for NetBSD
+
+- Do we need to TRIM arguments from SOAP ?
diff --git a/miniupnpd/upnpsoap.c b/miniupnpd/upnpsoap.c
index ed75569..9d698e2 100644
--- a/miniupnpd/upnpsoap.c
+++ b/miniupnpd/upnpsoap.c
@@ -427,6 +427,15 @@ AddPortMapping(struct upnphttp * h, const char * action, const char * ns)
 	eport = (unsigned short)atoi(ext_port);
 	iport = (unsigned short)atoi(int_port);
 
+	/* TODO : check if we are supporting wildcard ExternalPort
+	if (strcmp(ext_port, "*") == 0 || eport == 0)
+	{
+		ClearNameValueList(&data);
+		SoapError(h, 716, "Wildcard not permited in ExtPort");
+		return;
+	}
+	*/
+
 	leaseduration = leaseduration_str ? atoi(leaseduration_str) : 0;
 #ifdef IGD_V2
 	/* PortMappingLeaseDuration can be either a value between 1 and