diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c7b064b68..7d68c0e01 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-08-01  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org.el (org-read-date): Make sure the calendar is in the current
+	frame.
+
 	* org-table.el (org-table-error-on-row-ref-crossing-hline):
 	Variable made obsolete.
 	(org-table-relative-ref-may-cross-hline): New option.
diff --git a/lisp/org.el b/lisp/org.el
index 99e1865ba..bac081264 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -12202,6 +12202,7 @@ user."
 		    (setcar (nthcdr 1 defdecode) 59)
 		    (setq def (apply 'encode-time defdecode)
 			  defdecode (decode-time def)))))
+	 (calendar-frame-setup nil)
 	 (calendar-move-hook nil)
 	 (calendar-view-diary-initially-flag nil)
 	 (view-diary-entries-initially nil)