  };
  
  #endif
-Index: config/upnpcontrol.cpp
-===================================================================
---- config/upnpcontrol.cpp	(revision 0)
-+++ config/upnpcontrol.cpp	(revision 0)
-@@ -0,0 +1,93 @@
+Index: src/vidalia/config/upnpcontrol.cpp
+===================================================================
+--- src/vidalia/config/upnpcontrol.cpp	(revision 0)
++++ src/vidalia/config/upnpcontrol.cpp	(revision 0)
+@@ -0,0 +1,129 @@
 +/*
 +**  This file is part of Vidalia, and is subject to the license terms in the
 +**  LICENSE file, found in the top level directory of this distribution. If 

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

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
