diff --git a/ChangeLog b/ChangeLog
index 6c75b25181..2127c095ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-04  Tor Lillqvist  <tml@novell.com>
+
+	* gtk/gtkcalendar.c (gtk_calendar_init): Make it compile without
+	HAVE__NL_TIME_FIRST_WEEKDAY. (#317910, Mathias Hasselmann)
+
 2005-10-04  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkrc.c (gtk_rc_clear_realized_style): Revert the change
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6c75b25181..2127c095ee 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-10-04  Tor Lillqvist  <tml@novell.com>
+
+	* gtk/gtkcalendar.c (gtk_calendar_init): Make it compile without
+	HAVE__NL_TIME_FIRST_WEEKDAY. (#317910, Mathias Hasselmann)
+
 2005-10-04  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkrc.c (gtk_rc_clear_realized_style): Revert the change
diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index aaedee9f53..d8daeaa574 100644
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -565,10 +565,14 @@ gtk_calendar_init (GtkCalendar *calendar)
   time_t tmp_time;
   GtkCalendarPrivate *priv;
   gchar *year_before;
+#ifdef HAVE__NL_TIME_FIRST_WEEKDAY
   gchar *langinfo;
   gint week_1stday = 0;
   gint first_weekday = 1;
   guint week_origin;
+#else
+  gchar *week_start;
+#endif
 
   priv = calendar->priv = G_TYPE_INSTANCE_GET_PRIVATE (calendar,
 						       GTK_TYPE_CALENDAR,