diff --git a/ChangeLog b/ChangeLog
index 6fd90d65c7..2168c2b07e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-18  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkcalendar.c (gtk_calendar_init): _NL_FIRST_WEEKDAY is
+	1-based.  (#163842, Pierre Ossman)
+
 2005-06-17  Kristian Rietveld  <kris@gtk.org>
 
 	Fix #160281, testcase from Peter Bloomfield.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6fd90d65c7..2168c2b07e 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-06-18  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkcalendar.c (gtk_calendar_init): _NL_FIRST_WEEKDAY is
+	1-based.  (#163842, Pierre Ossman)
+
 2005-06-17  Kristian Rietveld  <kris@gtk.org>
 
 	Fix #160281, testcase from Peter Bloomfield.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6fd90d65c7..2168c2b07e 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-06-18  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkcalendar.c (gtk_calendar_init): _NL_FIRST_WEEKDAY is
+	1-based.  (#163842, Pierre Ossman)
+
 2005-06-17  Kristian Rietveld  <kris@gtk.org>
 
 	Fix #160281, testcase from Peter Bloomfield.
diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index be5ccff394..239aabc5e2 100644
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -652,7 +652,7 @@ gtk_calendar_init (GtkCalendar *calendar)
 
 #ifdef HAVE__NL_TIME_FIRST_WEEKDAY
   week_start = nl_langinfo (_NL_TIME_FIRST_WEEKDAY);
-  priv->week_start = *((unsigned char *) week_start) % 7;
+  priv->week_start = *((unsigned char *) week_start) % 7 - 1;
 #else
   /* Translate to calendar:week_start:0 if you want Sunday to be the
    * first day of the week to calendar:week_start:1 if you want Monday