diff --git a/ripd/ChangeLog b/ripd/ChangeLog
index b776c55..066c527 100644
--- a/ripd/ChangeLog
+++ b/ripd/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-11 Emmanuel Vize <emmanuel.vize@6wind.com>
+
+	* ripd.c: (rip_vty_out_uptime) Use new thread_timer_remain_second
+	  to display properly the route timeout, displayed by "show ip rip"
+
 2007-03-21 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
 
 	* ripd.c: (show_ip_rip_status) Use new thread_timer_remain_second
diff --git a/ripd/ripd.c b/ripd/ripd.c
index f656073..fb5b177 100644
--- a/ripd/ripd.c
+++ b/ripd/ripd.c
@@ -3389,14 +3389,14 @@
 
   if ((thread = rinfo->t_timeout) != NULL)
     {
-      clock = thread->u.sands.tv_sec - timer_now.tv_sec;
+      clock = thread_timer_remain_second (thread);
       tm = gmtime (&clock);
       strftime (timebuf, TIME_BUF, "%M:%S", tm);
       vty_out (vty, "%5s", timebuf);
     }
   else if ((thread = rinfo->t_garbage_collect) != NULL)
     {
-      clock = thread->u.sands.tv_sec - timer_now.tv_sec;
+      clock = thread_timer_remain_second (thread);
       tm = gmtime (&clock);
       strftime (timebuf, TIME_BUF, "%M:%S", tm);
       vty_out (vty, "%5s", timebuf);