    torcontrol
    util
  )
-Index: config/serversettings.cpp
-===================================================================
---- config/serversettings.cpp	(revision 2473)
-+++ config/serversettings.cpp	(working copy)
+Index: src/vidalia/config/serversettings.cpp
+===================================================================
+--- src/vidalia/config/serversettings.cpp	(revision 2473)
++++ src/vidalia/config/serversettings.cpp	(working copy)
 @@ -20,6 +20,7 @@
  
  #include "serversettings.h"

+	sprintf(port_str, "%d", port);
+	UPNP_DeletePortMapping(urls.controlURL, data.servicetype, port_str, "TCP");
+}
Index: config/upnpcontrol.h
===================================================================
--- config/upnpcontrol.h	(revision 0)
+++ config/upnpcontrol.h	(revision 0)
@@ -0,0 +1,48 @@
+/*
+**  This file is part of Vidalia, and is subject to the license terms in the

Index: INSTALL
===================================================================
--- INSTALL	(revision 2465)
+++ INSTALL	(working copy)
@@ -206,3 +206,8 @@
 'cmake --help' or 'man cmake' (on non-Windows platforms) for more information
 about supported generators and configuration options.
 
+Including UPnP support
+----------------------
+
+cmake -G "MSYS Makefiles" -DMINIUPNPC_LIBRARY_DIR="/usr/local/lib" -DMINIUPNPC_INCLUDE_DIR="/usr/local/include" .
+
Index: src/vidalia/CMakeLists.txt
===================================================================
--- src/vidalia/CMakeLists.txt	(revision 2473)
+++ src/vidalia/CMakeLists.txt	(working copy)
@@ -16,6 +16,7 @@
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/config
