diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 7c374fb..1bc3232 100644
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-10 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+	* ospf_packet.c: (ospf_hello) Improve NetworkMask mismatch warning
+	  message to include interface name and conflicting prefix lengths.
+
 2006-07-07 Paul Jakma <paul.jakma@sun.com>
 
 	* ospf_nsm.h: Add a NSM_Deleted neighbour state, to act as dummy
diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index 569f251..788daba 100644
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -785,8 +785,9 @@
       && oi->type != OSPF_IFTYPE_VIRTUALLINK)
     if (oi->address->prefixlen != p.prefixlen)
       {
-	zlog_warn ("Packet %s [Hello:RECV]: NetworkMask mismatch.",
-		   inet_ntoa (ospfh->router_id));
+	zlog_warn ("Packet %s [Hello:RECV]: NetworkMask mismatch on %s (configured prefix length is %d, but hello packet indicates %d).",
+		   inet_ntoa(ospfh->router_id), IF_NAME(oi),
+		   (int)oi->address->prefixlen, (int)p.prefixlen);
 	return;
       }