diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog
index 7f0130a..2294f89 100644
--- a/bgpd/ChangeLog
+++ b/bgpd/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-19 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+	* bgpd.c: (peer_uptime) Fix printf format/arg mismatch in
+	  zlog_warn message (%ld/size_t -> %lu/u_long).
+
 2006-09-14 Paul Jakma <paul.jakma@sun.com>
 
 	* bgp_route.c: (bgp_table_stats_walker) Address space announced
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 89f8262..1ead13c 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -4250,8 +4250,7 @@
   /* Check buffer length. */
   if (len < BGP_UPTIME_LEN)
     {
-      /* XXX: warning: long int format, size_t arg (arg 2) */
-      zlog_warn ("peer_uptime (): buffer shortage %ld", len);
+      zlog_warn ("peer_uptime (): buffer shortage %lu", (u_long)len);
       /* XXX: should return status instead of buf... */
       snprintf (buf, len, "<error> "); 
       return buf;