diff --git a/ChangeLog b/ChangeLog
index 2583b12064..d1e671bf17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-18  Michael Natterer  <mitch@imendio.com>
+
+	* gtk/gtkcalendar.c: set the maximum of the "year" property to
+	G_MAXINT >> 8 instead of G_MAXINT to fix overflows in internal
+	calculations which in turn caused writing beyond the boundaries of
+	the calendar->day_month[] and day[] arrays which in turn caused a
+	SEGV. This limits the lifetime of GTK+ to the year 8,388,608 ;)
+
 2008-06-18  Michael Natterer  <mitch@imendio.com>
 
 	* tests/Makefile.am
diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index 9db1726fb9..43416c2e02 100644
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -441,7 +441,7 @@ gtk_calendar_class_init (GtkCalendarClass *class)
                                    g_param_spec_int ("year",
 						     P_("Year"),
 						     P_("The selected year"),
-						     0, G_MAXINT, 0,
+						     0, G_MAXINT >> 8, 0,
 						     GTK_PARAM_READWRITE));
 
   /**