diff --git a/ChangeLog b/ChangeLog
index fe3b3960e..9173233c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 
+	* fix tracker connection bind issue for IPv6 trackers
 	* fix error handling of some merkle torrents
 	* fix error handling of unsupported hard-links
 
diff --git a/src/session_impl.cpp b/src/session_impl.cpp
index 3922c65e8..ba3aa6816 100644
--- a/src/session_impl.cpp
+++ b/src/session_impl.cpp
@@ -1332,7 +1332,11 @@ namespace aux {
 		}
 #endif
 
-		if (!req.bind_ip) req.bind_ip = m_listen_interface.address();
+		if (!req.bind_ip
+			&& m_listen_interface.address() != address_v4::any())
+		{
+			req.bind_ip = m_listen_interface.address();
+		}
 		m_tracker_manager.queue_request(get_io_service(), req, c);
 	}