diff --git a/ChangeLog b/ChangeLog
index 00d589f80..29442ba64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-02  Behdad Esfahbod  <behdad@gnome.org>
+
+	* gobject/genum.h: Make value_name and value_nick const in structs
+	_GEnumValue and _GFlagValue.  (#317793)
+
 2006-06-01  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/gmain.h: 
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 00d589f80..29442ba64 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2006-06-02  Behdad Esfahbod  <behdad@gnome.org>
+
+	* gobject/genum.h: Make value_name and value_nick const in structs
+	_GEnumValue and _GFlagValue.  (#317793)
+
 2006-06-01  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/gmain.h: 
diff --git a/gobject/genums.h b/gobject/genums.h
index 3af3f3abe..5d16c53c0 100644
--- a/gobject/genums.h
+++ b/gobject/genums.h
@@ -69,14 +69,14 @@ struct	_GFlagsClass
 struct _GEnumValue
 {
   gint	 value;
-  gchar *value_name;
-  gchar *value_nick;
+  const gchar *value_name;
+  const gchar *value_nick;
 };
 struct _GFlagsValue
 {
   guint	 value;
-  gchar *value_name;
-  gchar *value_nick;
+  const gchar *value_name;
+  const gchar *value_nick;
 };