diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 61dc89cd7..87ae30685 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-11-09  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-agenda.el (org-agenda-add-entry-to-org-agenda-diary-file):
+	Require diary-lib for (diary-date-display-form).
+
 	* org.el (org-log-reschedule, org-log-redeadline): New options.
 	(org-log-note-headings): Add templates for rescheduling and
 	deadline changing.
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 3b3a5bc58..7623906ec 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -6702,6 +6702,7 @@ the resulting entry will not be shown.  When TEXT is empty, switch to
       (org-back-over-empty-lines)
       (backward-char 1)
       (insert "\n")
+      (require 'diary-lib)
       (let ((calendar-date-display-form (diary-date-display-form)))
 	(insert (format "%%%%(diary-anniversary %s) %s"
 			(calendar-date-string d1 nil t) text))))