diff --git a/ChangeLog b/ChangeLog
index 7e9114ddae..50e7eb9b7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* perf/treeview.c: const correctness fixes
+	found by Arjan van de Ven and gcc.
+
 2005-11-15  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Bump version
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7e9114ddae..50e7eb9b7e 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-11-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* perf/treeview.c: const correctness fixes
+	found by Arjan van de Ven and gcc.
+
 2005-11-15  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Bump version
diff --git a/contrib/gdk-pixbuf-xlib/ChangeLog b/contrib/gdk-pixbuf-xlib/ChangeLog
index 241891af1c..b45a176597 100644
--- a/contrib/gdk-pixbuf-xlib/ChangeLog
+++ b/contrib/gdk-pixbuf-xlib/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk-pixbuf-xlib-drawable.c: 
+	* gdk-pixbuf-xlibrgb.c: const correctness fixes
+	found by Arjan van de Ven and gcc.
+
 2005-11-15  Matthias Clasen  <mclasen@redhat.com>
 
 	* === Released 2.8.7 ===
diff --git a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
index da9dae2f80..38ad9b20b9 100644
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
@@ -41,7 +41,7 @@
 
 
 
-static guint32 mask_table[] = {
+static const guint32 mask_table[] = {
 	0x00000000, 0x00000001, 0x00000003, 0x00000007,
 	0x0000000f, 0x0000001f, 0x0000003f, 0x0000007f,
 	0x000000ff, 0x000001ff, 0x000003ff, 0x000007ff,
@@ -1058,7 +1058,7 @@ convert_real_slow (XImage *image, guchar *pixels, int rowstride, xlib_colormap *
 
 typedef void (* cfunc) (XImage *image, guchar *pixels, int rowstride, xlib_colormap *cmap);
 
-static cfunc convert_map[] = {
+static const cfunc convert_map[] = {
 	rgb1,rgb1,rgb1a,rgb1a,
 	rgb8,rgb8,rgb8a,rgb8a,
 	rgb555lsb,rgb555msb,rgb555alsb,rgb555amsb,
diff --git a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.c b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.c
index b5d0f8e3e9..701f34a9dd 100644
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.c
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.c
@@ -516,7 +516,7 @@ static guint32
 xlib_rgb_score_visual (XVisualInfo *visual)
 {
   guint32 quality, speed, pseudo, sys;
-  static const char* visual_names[] =
+  static const char * const visual_names[] =
   {
     "static gray",
     "grayscale",
diff --git a/modules/engines/pixbuf/ChangeLog b/modules/engines/pixbuf/ChangeLog
index 56a08bd269..1dc2a73af1 100644
--- a/modules/engines/pixbuf/ChangeLog
+++ b/modules/engines/pixbuf/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* pixbuf-rc-style.c: const correctness fixes
+	found by Arjan van de Ven and gcc.
+
 2005-11-15  Matthias Clasen  <mclasen@redhat.com>
 
 	* === Released 2.8.7 ===
diff --git a/modules/engines/pixbuf/pixbuf-rc-style.c b/modules/engines/pixbuf/pixbuf-rc-style.c
index ef93363cee..e688927c58 100644
--- a/modules/engines/pixbuf/pixbuf-rc-style.c
+++ b/modules/engines/pixbuf/pixbuf-rc-style.c
@@ -36,7 +36,7 @@ static GtkStyle *pixbuf_rc_style_create_style (GtkRcStyle         *rc_style);
 
 static void theme_image_unref (ThemeImage *data);
 
-static struct
+static const struct
   {
     gchar              *name;
     guint               token;