diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 29e40f668ee..4cd1ba137a3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-01  Miles Bader  <miles@lsi.nec.co.jp>
+
+	* calendar/calendar.el (diary-face, holiday-face): Add
+	dark-background variants.
+
 2000-10-31  Sam Steingold  <sds@gnu.org>
 
 	* textmodes/tex-mode.el (tex-file): Use `default-directory' when
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index c98ecd6d14c..4eb08e16265 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -207,9 +207,12 @@ If nil, make an icon of the frame.  If non-nil, delete the frame."
 (when window-system
   (add-to-list 'facemenu-unlisted-faces 'diary-face)
   (defface diary-face
-    '((((class color))
-       (:foreground "red"))
-      (t (:bold t)))
+    '((((class color) (background light))
+       :foreground "red")
+      (((class color) (background dark))
+       :foreground "yellow")
+      (t
+       :bold t))
     "Face for highlighting diary entries."
     :group 'diary)
 
@@ -221,9 +224,12 @@ If nil, make an icon of the frame.  If non-nil, delete the frame."
 
   (add-to-list 'facemenu-unlisted-faces 'holiday-face)
   (defface holiday-face
-    '((((class color))
-       (:background "pink"))
-      (t (:inverse-video t)))
+    '((((class color) (background light))
+       :background "pink")
+      (((class color) (background dark))
+       :background "chocolate4")
+      (t
+       :inverse-video t))
     "Face for indicating dates that have holidays."
     :group 'diary))