diff --git a/ChangeLog b/ChangeLog
index 22a3658ed..ba47a5d3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@
 	* fix uTP edge case where udp socket buffer fills up
 	* fix nagle implementation in uTP
 
+	* active_dht_limit, active_tracker_limit and active_lsd_limit now interpret -1 as infinite
+
 0.16.6 release
 
 	* fixed verbose log error for NAT holepunching
diff --git a/src/session_impl.cpp b/src/session_impl.cpp
index bd58d3559..99a262167 100644
--- a/src/session_impl.cpp
+++ b/src/session_impl.cpp
@@ -4205,6 +4205,12 @@ retry:
 			num_seeds = (std::numeric_limits<int>::max)();
 		if (hard_limit == -1)
 			hard_limit = (std::numeric_limits<int>::max)();
+		if (dht_limit == -1)
+			dht_limit = (std::numeric_limits<int>::max)();
+		if (lsd_limit == -1)
+			lsd_limit = (std::numeric_limits<int>::max)();
+		if (tracker_limit == -1)
+			tracker_limit = (std::numeric_limits<int>::max)();
             
 		for (torrent_map::iterator i = m_torrents.begin()
 			, end(m_torrents.end()); i != end; ++i)