diff --git a/ChangeLog b/ChangeLog
index d8f019ea1..4c9cf221b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+	* non-auto-managed torrents no longer count against the torrent limits
 	* handle DHT error responses correctly
 	* allow force_announce to only affect a single tracker
 	* add moving_storage field to torrent_status
diff --git a/src/session_impl.cpp b/src/session_impl.cpp
index d3f2a9a5f..b3b11a63e 100644
--- a/src/session_impl.cpp
+++ b/src/session_impl.cpp
@@ -4298,16 +4298,6 @@ retry:
 			{
 				TORRENT_ASSERT(t->m_resume_data_loaded || !t->valid_metadata());
 				--hard_limit;
-			  	if (is_active(t, settings()))
-				{
-					// this is not an auto managed torrent,
-					// if it's running and active, decrease the
-					// counters.
-					if (t->is_finished())
-						--num_seeds;
-					else
-						--num_downloaders;
-				}
 			}
 		}
 
@@ -6186,7 +6176,6 @@ retry:
 
 	void session_impl::delete_port_mapping(int handle)
 	{
-		int ret = 0;
 		if (m_upnp) m_upnp->delete_mapping(handle);
 		if (m_natpmp) m_natpmp->delete_mapping(handle);
 	}