diff --git a/configure.ac b/configure.ac
index b4c5b810..8fb460e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,17 +12,12 @@ AC_PROG_CXX
 AC_PROG_LIBTOOL
 AC_SYS_LARGEFILE
 
-
-AC_SEARCH_LIBS(add_wch, ncursesw,
-  AC_DEFINE(HAVE_NCURSESW, 1, defined if ncurses wide character support is available),
-  AC_SEARCH_LIBS(wbkgdset, ncurses curses,,echo "*** The ncurses library is required!";exit 1)
-)
-
 TORRENT_CHECK_EXECINFO()
 TORRENT_CHECK_CURL()
 TORRENT_OTFD()
 
 TORRENT_WITHOUT_VARIABLE_FDSET()
+TORRENT_WITHOUT_NCURSESW()
 
 PKG_CHECK_MODULES(STUFF, sigc++-2.0 libtorrent >= 0.9.0,
 	          CXXFLAGS="$CXXFLAGS $STUFF_CFLAGS $CURL_CFLAGS";
diff --git a/doc/rtorrent.1.xml b/doc/rtorrent.1.xml
index bee7a61b..56888087 100644
--- a/doc/rtorrent.1.xml
+++ b/doc/rtorrent.1.xml
@@ -672,6 +672,25 @@ Controls whetever a lock file is created in the session directory.
         </para></listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term>use_udp_trackers = <replaceable>yes</replaceable></term>
+        <listitem><para>
+
+Use UDP trackers. Disable if you are behind a firewall etc that does
+not allow connections to UDP trackers.
+
+        </para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>enable_trackers = <replaceable>yes</replaceable></term>
+        <listitem><para>
+
+Set to <emphasis>no</emphasis> to disable tracker requests.
+
+        </para></listitem>
+      </varlistentry>
+
       <varlistentry>
         <term>tracker_dump = <replaceable>filename</replaceable></term>
         <listitem><para>
diff --git a/scripts/checks.m4 b/scripts/checks.m4
index b2f48ebe..bb2a4485 100644
--- a/scripts/checks.m4
+++ b/scripts/checks.m4
@@ -181,3 +181,23 @@ AC_DEFUN([TORRENT_WITH_POSIX_FALLOCATE], [
       fi
     ])
 ])
+
+AC_DEFUN([TORRENT_WITHOUT_NCURSESW], [
+  AC_ARG_WITH(ncursesw,
+    [  --without-ncursesw      Don't try to use wide char ncurses.],
+    [
+      if test "$withval" = "no"; then
+	AC_SEARCH_LIBS(add_wch, ncursesw,
+	  AC_DEFINE(HAVE_NCURSESW, 1, defined if ncurses wide character support is available),
+	  AC_SEARCH_LIBS(wbkgdset, ncurses curses,,echo "*** The ncurses library is required!";exit 1)
+        )
+      else
+	AC_SEARCH_LIBS(wbkgdset, ncurses curses,,echo "*** The ncurses library is required!";exit 1)
+      fi
+    ],[
+      AC_SEARCH_LIBS(add_wch, ncursesw,
+	AC_DEFINE(HAVE_NCURSESW, 1, defined if ncurses wide character support is available),
+	AC_SEARCH_LIBS(wbkgdset, ncurses curses,,echo "*** The ncurses library is required!";exit 1)
+      )
+    ])
+])
diff --git a/src/core/manager.cc b/src/core/manager.cc
index 086db0b8..72c0afe8 100644
--- a/src/core/manager.cc
+++ b/src/core/manager.cc
@@ -258,9 +258,9 @@ Manager::set_bind_address(const std::string& addr) {
       torrent::connection_manager()->set_bind_address(ai->address()->c_sockaddr());
     }
 
-    rak::address_info::free_address_info(ai);
+    m_pollManager->get_http_stack()->set_bind_address(!ai->address()->is_address_any() ? ai->address()->address_str() : std::string());
 
-    m_pollManager->get_http_stack()->set_bind_address(addr);
+    rak::address_info::free_address_info(ai);
 
   } catch (torrent::input_error& e) {
     rak::address_info::free_address_info(ai);