diff --git a/CHANGELOG b/CHANGELOG
index 8da4d10..307c72d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,9 @@ version 2.66
 	    dnsmasq configuration file or restart the daemon. Thanks to
 	    Steven Barth for extensive testing and development work on
 	    this idea.
+
+	    Fix crash on startup on Solaris 11. Regression probably
+	    introduced in 2.61.  Thanks to Geoff Johnstone for the patch.
   
 
 version 2.65
diff --git a/src/bpf.c b/src/bpf.c
index 4ab872e..5702cf8 100644
--- a/src/bpf.c
+++ b/src/bpf.c
@@ -111,7 +111,7 @@ int iface_enumerate(int family, void *parm, int (*callback)())
 	{
 	  int iface_index = if_nametoindex(addrs->ifa_name);
 
-	  if (iface_index == 0)
+	  if (iface_index == 0 || !addrs->ifa_addr || !addrs->ifa_netmask || !addrs->ifa_broadaddr)
 	    continue;
 
 	  if (family == AF_INET)