diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 76c220a..1a8817a 100644
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,5 +1,12 @@
 2005-10-21 Paul Jakma <paul.jakma@sun.com>
 
+	* ospf_dump.c: (ospf_timeval_dump) fix ms adjustment, thanks to
+	  Andrew Schorr.
+	* ospf_vty.c: (ospf_config_write) fix write out of spf timers
+	  configuration.
+
+2005-10-21 Paul Jakma <paul.jakma@sun.com>
+
 	* (general) SPF millisecond resolution timer with adaptive,
 	  linear back-off holdtime. Prettification of ospf_timer_dump.
 	* ospf_dump.c: (ospf_timeval_dump) new function. The guts of
diff --git a/ospfd/ospf_dump.c b/ospfd/ospf_dump.c
index 9ae87a6..2cccc14 100644
--- a/ospfd/ospf_dump.c
+++ b/ospfd/ospf_dump.c
@@ -249,8 +249,8 @@
   
   if (ms >= 1000)
     {
-      t->tv_sec = ms / 1000;
-      ms =- t->tv_sec * 1000;
+      t->tv_sec += ms / 1000;
+      ms %= 1000;
     }
   
   if (t->tv_sec > WEEK_IN_SECONDS)
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 5263f15..2115b98 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -7603,9 +7603,11 @@
 
       /* SPF timers print. */
       if (ospf->spf_delay != OSPF_SPF_DELAY_DEFAULT ||
-	  ospf->spf_holdtime != OSPF_SPF_HOLDTIME_DEFAULT)
-	vty_out (vty, " timers spf %d %d%s",
-		 ospf->spf_delay, ospf->spf_holdtime, VTY_NEWLINE);
+	  ospf->spf_holdtime != OSPF_SPF_HOLDTIME_DEFAULT ||
+	  ospf->spf_max_holdtime != OSPF_SPF_MAX_HOLDTIME_DEFAULT)
+	vty_out (vty, " timers throttle spf %d %d %d%s",
+		 ospf->spf_delay, ospf->spf_holdtime, 
+		 ospf->spf_max_holdtime, VTY_NEWLINE);
 
       /* SPF refresh parameters print. */
       if (ospf->lsa_refresh_interval != OSPF_LSA_REFRESH_INTERVAL_DEFAULT)