diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ecaaeae6a..7ce97594b 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-05  John Wiegley  <jwiegley@gmail.com>
+
+	* org-clock.el (org-resolve-clocks-if-idle): Another fix to the
+	way the amount of idle time is presented in the minibuffer.
+
 2009-11-05  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-icalendar.el (org-print-icalendar-entries): Use
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index a70cba93e..4f058a0ab 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -796,8 +796,10 @@ if the user really wants to stay clocked in after being idle for
 so long."
   (when (and org-clock-idle-time (not org-clock-resolving-clocks)
 	     org-clock-marker)
-    (let ((org-clock-user-idle-start (current-time))
-	  (org-clock-user-idle-seconds (org-user-idle-seconds))
+    (let ((org-clock-user-idle-seconds (org-user-idle-seconds))
+	  (org-clock-user-idle-start
+	   (time-subtract (current-time)
+			  (seconds-to-time org-clock-user-idle-seconds)))
 	  (org-clock-resolving-clocks-due-to-idleness t))
       (if (> org-clock-user-idle-seconds (* 60 org-clock-idle-time))
 	  (org-clock-resolve
@@ -805,12 +807,12 @@ so long."
 		 org-clock-start-time)
 	   (function
 	    (lambda (clock)
-	      (format "Clocked in & idle for %d mins"
+	      (format "Clocked in & idle for %.1f mins"
 		      (/ (org-float-time
 			  (time-subtract (current-time)
-					 org-clock-user-idle-start)) 60))))
-	   (time-subtract (current-time)
-			  (seconds-to-time org-clock-user-idle-seconds)))))))
+					 org-clock-user-idle-start))
+			 60.0))))
+	   org-clock-user-idle-start)))))
 
 (defun org-clock-in (&optional select)
   "Start the clock on the current item.