diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 071047684..3a8618759 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2010-01-20  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-agenda.el (org-agenda-diary-entry-in-org-file): Make sure
+	org-datetree.el is loaded.
+
+	* org-datetree.el: autoload `org-datetree-find-day-create'
+
 	* org-latex.el (org-export-latex-hyperref-format): New option.
 	(org-export-latex-links): Use `org-export-latex-hyperref-format'.
 
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index a20bec5ec..9a7656355 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -6832,6 +6832,7 @@ The cursor may be at a date in the calendar, or in the Org agenda."
      ((equal char ?j)
       (org-switch-to-buffer-other-window
        (find-file-noselect org-agenda-diary-file))
+      (require 'org-datetree)
       (org-datetree-find-date-create d1)
       (org-reveal t))
      (t (error "Invalid selection character `%c'" char)))))
diff --git a/lisp/org-datetree.el b/lisp/org-datetree.el
index 23372b3ef..3115e5ff7 100644
--- a/lisp/org-datetree.el
+++ b/lisp/org-datetree.el
@@ -39,6 +39,7 @@ This is normally one, but if the buffer has an entry with a DATE_TREE
 property, the date tree will become a subtree under that entry, so the
 base level will be properly adjusted.")
 
+;;;###autoload
 (defun org-datetree-find-date-create (date &optional keep-restriction)
   "Find or create an entry for DATE.
 If KEEP-RESTRICTION is non-nil, do not widen the buffer.