diff --git a/CHANGES b/CHANGES
index 28e5d9c8b5..70f8bcca85 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1025.	[bug]		Don't use multicast addresses to resolve iterative
+			queries.  [RT #101]
+
 1024.	[port]		HP and Sun decided to use the same macros and
 			structures for different things.  [RT #1831]
 
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 9eee6827e8..755161f737 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.223 2001/09/21 13:31:55 marka Exp $ */
+/* $Id: resolver.c,v 1.224 2001/10/03 07:43:03 marka Exp $ */
 
 #include <config.h>
 
@@ -1652,6 +1652,9 @@ possibly_mark(fetchctx_t *fctx, dns_adbaddrinfo_t *addr)
 	if (aborted) {
 		addr->flags |= FCTX_ADDRINFO_MARK;
 		msg = "ignoring backholed / bogus server: ";
+	} else if (isc_sockaddr_ismulticast(sa)) {
+		addr->flags |= FCTX_ADDRINFO_MARK;
+		msg = "ignoring multicast address: ";
 	} else if (sa->type.sa.sa_family != AF_INET6) {
 		return;
 	} else if (IN6_IS_ADDR_V4MAPPED(&sa->type.sin6.sin6_addr)) {