diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4b68f302a3c..a042130a79a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-05  Glenn Morris  <rgm@gnu.org>
+
+	* calendar/diary-lib.el (top-level): Make load behave more like require.
+
 2009-11-04  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* custom.el (custom-declare-group): Purecopy standard-value.
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 68dbf144aa3..82fbc35b82d 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -29,7 +29,7 @@
 ;;; Code:
 
 (require 'calendar)
-(load "diary-loaddefs" nil 'nomessage)
+(eval-and-compile (load "diary-loaddefs" nil t))
 
 (defgroup diary nil
   "Emacs diary."