diff --git a/zebra/ChangeLog b/zebra/ChangeLog
index 10db253..3ed8c63 100644
--- a/zebra/ChangeLog
+++ b/zebra/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-22 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+	* connected.c: (connected_add_ipv4) Limit warning about /32 addresses
+	  with no peer specified to PtP interfaces only.
+
 2004-12-18 Hasso Tepper <hasso at quagga.net>
 
 	* zebra_vty.c: Fix "show ipv6 route <proto>" command help and make it
diff --git a/zebra/connected.c b/zebra/connected.c
index 9a6fd66..5f58191 100644
--- a/zebra/connected.c
+++ b/zebra/connected.c
@@ -156,9 +156,9 @@
     }
   else
     /* no broadcast or destination address was supplied */
-    if (prefixlen == IPV4_MAX_PREFIXLEN)
-      zlog_warn("warning: interface %s with addr %s/%d needs a peer address",
-		ifp->name,inet_ntoa(*addr),prefixlen);
+    if ((prefixlen == IPV4_MAX_PREFIXLEN) && if_is_pointopoint(ifp))
+      zlog_warn("warning: PtP interface %s with addr %s/%d needs a "
+      		"peer address",ifp->name,inet_ntoa(*addr),prefixlen);
 
   /* Label of this address. */
   if (label)