diff --git a/ChangeLog b/ChangeLog
index b291324fb..969e72136 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-08  Glenn Morris  <rmg@gnu.org>
+
+	(list-diary-entries-hook): Declare for compiler.
+	(org-get-entries-from-diary): Require diary-lib.
+
 2008-03-07  Glenn Morris  <rmg@gnu.org>
 
 	(org-agenda-sunrise-sunset): Require solar.
diff --git a/org.el b/org.el
index cda8975d1..a942741fd 100644
--- a/org.el
+++ b/org.el
@@ -21531,9 +21531,11 @@ MATCH is being ignored."
 ;;; Diary integration
 
 (defvar org-disable-agenda-to-diary nil)          ;Dynamically-scoped param.
+(defvar list-diary-entries-hook)
 
 (defun org-get-entries-from-diary (date)
   "Get the (Emacs Calendar) diary entries for DATE."
+  (require 'diary-lib)
   (let* ((fancy-diary-buffer "*temporary-fancy-diary-buffer*")
 	 (diary-display-hook '(fancy-diary-display))
 	 (pop-up-frames nil)