diff --git a/CHANGES b/CHANGES
index 75e4392706..61fb7613f2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+1697.	[bug]		xxx-source{,-v6} was not effective when it
+			specified one of listening addresses and a
+			different port than the listening port. [RT #12257]
+
 1696.	[bug]		dnssec-signzone failed to clean out nodes that
 			consisted of only NSEC and RRSIG records.
 			[RT #12154]
diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c
index 718547c77c..7ff8d51286 100644
--- a/lib/dns/dispatch.c
+++ b/lib/dns/dispatch.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dispatch.c,v 1.118 2004/07/21 00:48:19 marka Exp $ */
+/* $Id: dispatch.c,v 1.119 2004/08/15 04:37:38 jinmei Exp $ */
 
 #include <config.h>
 
@@ -1296,7 +1296,7 @@ local_addr_match(dns_dispatch_t *disp, isc_sockaddr_t *addr) {
 	if (result != ISC_R_SUCCESS)
 		return (ISC_FALSE);
 
-	return (isc_sockaddr_equal(&disp->local, &sockaddr));
+	return (isc_sockaddr_equal(&sockaddr, addr));
 }
 
 /*