diff --git a/HTTPServer.cpp b/HTTPServer.cpp
index d71deb3c..ec655709 100644
--- a/HTTPServer.cpp
+++ b/HTTPServer.cpp
@@ -118,6 +118,20 @@ namespace util
 
 	void HTTPConnection::FillContent (std::stringstream& s)
 	{
+		s << "Our external address:" << "<BR>" << "<BR>";
+		for (auto& address : i2p::context.GetRouterInfo().GetAddresses())
+		{
+			switch (address.transportStyle) {
+			case i2p::data::RouterInfo::eTransportNTCP:
+				s << "NTCP&nbsp;&nbsp;";
+				break;
+			case i2p::data::RouterInfo::eTransportSSU:
+				s << "SSU&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";
+				break;
+			}
+			s << address.host.to_string() << ":" << address.port << "<BR>";
+		}
+
 		s << "<P>Tunnels</P>";
 		for (auto it: i2p::tunnel::tunnels.GetOutboundTunnels ())
 		{	
diff --git a/Win32/i2pd.vcxproj b/Win32/i2pd.vcxproj
index c6f95ed7..f32f7cb4 100644
--- a/Win32/i2pd.vcxproj
+++ b/Win32/i2pd.vcxproj
@@ -32,6 +32,7 @@
     <ClCompile Include="..\Tunnel.cpp" />
     <ClCompile Include="..\TunnelEndpoint.cpp" />
     <ClCompile Include="..\TunnelGateway.cpp" />
+    <ClCompile Include="..\UPnP.cpp" />
     <ClCompile Include="..\util.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -62,6 +63,7 @@
     <ClInclude Include="..\TunnelConfig.h" />
     <ClInclude Include="..\TunnelEndpoint.h" />
     <ClInclude Include="..\TunnelGateway.h" />
+    <ClInclude Include="..\UPnP.h" />
     <ClInclude Include="..\util.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
diff --git a/Win32/i2pd.vcxproj.filters b/Win32/i2pd.vcxproj.filters
index 0eb7dc3d..f703bd80 100644
--- a/Win32/i2pd.vcxproj.filters
+++ b/Win32/i2pd.vcxproj.filters
@@ -81,6 +81,9 @@
     <ClCompile Include="..\Reseed.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\UPnP.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\Identity.h">
@@ -167,5 +170,8 @@
     <ClInclude Include="..\Reseed.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\UPnP.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file