diff --git a/CHANGES b/CHANGES
index 69f290e41e..6b47c6486e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
-1611.	[placeholder]	rt11065
+1611.	[bug]		solaris: IPv6 interface scanning failed to cope with
+			no active IPv6 interfaces.
 
 1610.	[bug]		On dual stack machines "dig -b" failed to set the
 			address type to be looked up with "@server".
diff --git a/lib/isc/unix/ifiter_ioctl.c b/lib/isc/unix/ifiter_ioctl.c
index ba0c45076a..b8fee5a62a 100644
--- a/lib/isc/unix/ifiter_ioctl.c
+++ b/lib/isc/unix/ifiter_ioctl.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ifiter_ioctl.c,v 1.44 2004/03/05 05:11:45 marka Exp $ */
+/* $Id: ifiter_ioctl.c,v 1.45 2004/04/15 07:02:06 marka Exp $ */
 
 /*
  * Obtain the list of network interfaces using the SIOCGLIFCONF ioctl.
@@ -267,7 +267,8 @@ getbuf6(isc_interfaceiter_t *iter) {
 		iter->bufsize6 *= 2;
 	}
 
-	iter->mode = 6;
+	if (iter->lifc.lifc_len != 0)
+		iter->mode = 6;
 	return (ISC_R_SUCCESS);
 
  cleanup: