diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c1f993191..b72a91421 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-20  Bernt Hansen <bernt@norang.ca>
+
+	* org-clock.el (org-clock-in): Set `org-clock-clocking-in' to
+	t before calling `org-clock-out', so that that function can
+	know its call context.
+
 2010-05-20  Russell Adams <RLAdams@AdamsInfoServ.Com>
 
 	* org.el (org-remove-inline-images): Call `clear-image-cache'.
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 68a40ce49..40019c0f9 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -959,7 +959,8 @@ the clocking selection, associated with the letter `d'."
 	    (move-marker org-clock-interrupted-task
 			 (marker-position org-clock-marker)
 			 (org-clocking-buffer))
-	    (org-clock-out t))))
+	    (let ((org-clock-clocking-in t))
+	      (org-clock-out t)))))
 
       (when (equal select '(16))
 	;; Mark as default clocking task