diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 804a02725..85addc2db 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2009-09-17  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org.el (org-closest-date): Fix issue with past preference.
+
 	* org-mobile.el (org-mobile-apply-flags): Require `org-archive'.
 
 	* org-archive.el (org-archive-set-tag)
diff --git a/lisp/org.el b/lisp/org.el
index eccb10966..ac5b1edd3 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -13279,11 +13279,11 @@ When SHOW-ALL is nil, only return the current occurrence of a time stamp."
       (setq n0 n1  n1 (min n1 n2)  n2 (max n0 n2))
       (if show-all
 	  (cond
-	   ((eq prefer 'past) n1)
+	   ((eq prefer 'past)   (if (= cday n2) n2 n1))
 	   ((eq prefer 'future) (if (= cday n1) n1 n2))
 	   (t (if (> (abs (- cday n1)) (abs (- cday n2))) n2 n1)))
 	(cond
-	 ((eq prefer 'past) n1)
+	 ((eq prefer 'past)   (if (= cday n2) n2 n1))
 	 ((eq prefer 'future) (if (= cday n1) n1 n2))
 	 (t (if (= cday n1) n1 n2)))))))