diff --git a/zebra/ChangeLog b/zebra/ChangeLog
index 4139e859c1..7bdec92182 100644
--- a/zebra/ChangeLog
+++ b/zebra/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-26 Robert Olsson <Robert.Olsson@data.slu.se>
+
+	* irdp_main.c: (irdp_send_thread) Skip non-AF_INET addresses,
+	   i.e. do not try interpret IPv6 addresses as IPv4 addresses
+	   to broadcast in IRDP announcements..
+
 2006-12-13 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
 
 	* if_ioctl_solaris.c: (if_get_addr) For IPv6, stop assuming
diff --git a/zebra/irdp_main.c b/zebra/irdp_main.c
index e4e71cf372..5510669927 100644
--- a/zebra/irdp_main.c
+++ b/zebra/irdp_main.c
@@ -244,6 +244,10 @@ int irdp_send_thread(struct thread *t_advert)
     for (ALL_LIST_ELEMENTS (ifp->connected, node, nnode, ifc))
       {
         p = ifc->address;
+        
+        if (p->family != AF_INET)
+          continue;
+        
         irdp_advertisement(ifp, p);
         irdp->irdp_sent++;
       }