2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0112dad3344..a2e9abede13 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-30  Glenn Morris  <rgm@gnu.org>
+
+        * calendar/holidays.el (holiday-christian-holidays):
+        Rename an entry.  (Bug#12289)
+
 2012-08-29  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * progmodes/sh-script.el (sh-font-lock-paren): Don't burp at BOB
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index 9edd353b889..8991d20c433 100644
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -250,7 +250,7 @@ See the documentation for `calendar-holidays' for details."
     (if calendar-christian-all-holidays-flag
         (append
          (holiday-fixed 1 6 "Epiphany")
-         (holiday-julian 12 25 "Eastern Orthodox Christmas")
+         (holiday-julian 12 25 "Christmas (Julian calendar)")
          (holiday-greek-orthodox-easter)
          (holiday-fixed 8 15 "Assumption")
          (holiday-advent 0 "Advent")))))