diff --git a/Config.cpp b/Config.cpp
index 10330c34..9e18ff55 100644
--- a/Config.cpp
+++ b/Config.cpp
@@ -134,6 +134,7 @@ namespace config {
   	options_description upnp("UPnP options");
   	upnp.add_options()
     ("upnp.enabled",  value<bool>()->default_value(upnp_default),             "Enable or disable UPnP: automatic port forwarding")
+	("upnp.name", value<std::string>()->default_value("I2Pd"), "Name i2pd appears in UPnP forwardings list") 
     ;
 
 	options_description precomputation("Precomputation options");
diff --git a/UPnP.cpp b/UPnP.cpp
index d9a5c68d..41b49e00 100644
--- a/UPnP.cpp
+++ b/UPnP.cpp
@@ -13,6 +13,7 @@
 #include "NetDb.h"
 #include "util.h"
 #include "RouterInfo.h"
+#include "Config.h"
 
 #include <miniupnpc/miniupnpc.h>
 #include <miniupnpc/upnpcommands.h>
@@ -143,7 +144,7 @@ namespace transport
     {
         std::string strType (GetProto (address)), strPort (std::to_string (address->port));
         int r;
-        std::string strDesc = "I2Pd";
+        std::string strDesc; i2p::config::GetOption("upnp.name", strDesc);
         r = UPNP_AddPortMapping (m_upnpUrls.controlURL, m_upnpData.first.servicetype, strPort.c_str (), strPort.c_str (), m_NetworkAddr, strDesc.c_str (), strType.c_str (), 0, "0");
         if (r!=UPNPCOMMAND_SUCCESS)
         {