diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 191288e..855ea29 100644
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,10 @@
+2007-03-14 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+	* ospf_zebra.c: (ospf_zebra_add, ospf_zebra_delete) Fix bug
+	  where inet_ntoa was used twice in the same debug message,
+	  which doesn't work because there's a single shared buffer
+	  for the returned string.  The fix is to use inet_ntop.
+
 2007-02-27 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
 
 	* ospfd.c: (ospf_terminate) Exit immediately if ospf is not
diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c
index bdd0142..f302d28 100644
--- a/ospfd/ospf_zebra.c
+++ b/ospfd/ospf_zebra.c
@@ -396,9 +396,13 @@
 
           if (IS_DEBUG_OSPF (zebra, ZEBRA_REDISTRIBUTE))
             {
-              zlog_debug ("Zebra: Route add %s/%d nexthop %s",
-                         inet_ntoa (p->prefix),
-                         p->prefixlen, inet_ntoa (path->nexthop));
+	      char buf[2][INET_ADDRSTRLEN];
+	      zlog_debug("Zebra: Route add %s/%d nexthop %s",
+			 inet_ntop(AF_INET, &p->prefix,
+				   buf[0], sizeof(buf[0])),
+			 p->prefixlen,
+			 inet_ntop(AF_INET, &path->nexthop,
+				   buf[1], sizeof(buf[1])));
             }
         }
 
@@ -462,9 +466,12 @@
 
           if (IS_DEBUG_OSPF (zebra, ZEBRA_REDISTRIBUTE) && api.nexthop_num)
             {
-              zlog_debug ("Zebra: Route delete %s/%d nexthop %s",
-                         inet_ntoa (p->prefix),
-                         p->prefixlen, inet_ntoa (**api.nexthop));
+	      char buf[2][INET_ADDRSTRLEN];
+	      zlog_debug("Zebra: Route delete %s/%d nexthop %s",
+			 inet_ntop(AF_INET, &p->prefix, buf[0], sizeof(buf[0])),
+			 p->prefixlen,
+			 inet_ntop(AF_INET, *api.nexthop,
+				   buf[1], sizeof(buf[1])));
             }
           if (IS_DEBUG_OSPF (zebra, ZEBRA_REDISTRIBUTE) && api.ifindex_num)
             {