diff --git a/ChangeLog b/ChangeLog
index 396e7b457..faf65d8e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+	* fix correct interface binding of local service discovery multicast
 	* fix issue with knowing which interfaces to announce to trackers and DHT
 	* undeprecate settings_pack::dht_upload_rate_limit
 
diff --git a/src/lsd.cpp b/src/lsd.cpp
index 357951144..ead3436d4 100644
--- a/src/lsd.cpp
+++ b/src/lsd.cpp
@@ -101,8 +101,8 @@ void lsd::debug_log(char const* fmt, ...) const
 #endif
 
 namespace {
-	address const lsd_multicast_addr4 = make_address_v4("239.192.152.143");
-	address const lsd_multicast_addr6 = make_address_v6("ff15::efc0:988f");
+	address_v4 const lsd_multicast_addr4 = make_address_v4("239.192.152.143");
+	address_v6 const lsd_multicast_addr6 = make_address_v6("ff15::efc0:988f");
 	int const lsd_port = 6771;
 }
 
@@ -118,7 +118,10 @@ void lsd::start(error_code& ec)
 
 	m_socket.bind(udp::endpoint(address_v4::any(), lsd_port), ec);
 	if (ec) return;
-	m_socket.set_option(join_group(v4 ? lsd_multicast_addr4 : lsd_multicast_addr6), ec);
+	if (v4)
+		m_socket.set_option(join_group(lsd_multicast_addr4, m_listen_address.to_v4()), ec);
+	else
+		m_socket.set_option(join_group(lsd_multicast_addr6, m_listen_address.to_v6().scope_id()), ec);
 	if (ec) return;
 	m_socket.set_option(hops(32), ec);
 	if (ec) return;
@@ -159,7 +162,7 @@ void lsd::announce_impl(sha1_hash const& ih, int const listen_port
 		int const msg_len = render_lsd_packet(msg, sizeof(msg), listen_port, aux::to_hex(ih).c_str()
 			, m_cookie, v4 ? v4_address : v6_address);
 
-		udp::endpoint const to(v4 ? lsd_multicast_addr4 : lsd_multicast_addr6
+		udp::endpoint const to(v4 ? address(lsd_multicast_addr4) : address(lsd_multicast_addr6)
 			, lsd_port);
 
 #ifndef TORRENT_DISABLE_LOGGING