diff --git a/ChangeLog b/ChangeLog
index 588ab3cb8f..b3c9fc6fff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-05-09  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/gstindex.c: (gst_index_resolver_get_type):
+	* plugins/elements/gstfakesink.c:
+	(gst_fake_sink_state_error_get_type):
+	* plugins/elements/gstfakesrc.c: (gst_fake_src_data_get_type),
+	(gst_fake_src_sizetype_get_type), (gst_fake_src_filltype_get_type):
+	* plugins/elements/gstqueue.c: (queue_leaky_get_type):
+	  Const-ify GEnumValue arrays.
+
 2006-05-09  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* tests/check/gst/gstbuffer.c: (GST_START_TEST):
diff --git a/gst/gstindex.c b/gst/gstindex.c
index d2073dc1a0..af06e96451 100644
--- a/gst/gstindex.c
+++ b/gst/gstindex.c
@@ -92,7 +92,7 @@ static GType
 gst_index_resolver_get_type (void)
 {
   static GType index_resolver_type = 0;
-  static GEnumValue index_resolver[] = {
+  static const GEnumValue index_resolver[] = {
     {GST_INDEX_RESOLVER_CUSTOM, "GST_INDEX_RESOLVER_CUSTOM",
         "Use a custom resolver"},
     {GST_INDEX_RESOLVER_GTYPE, "GST_INDEX_RESOLVER_GTYPE",
diff --git a/plugins/elements/gstfakesink.c b/plugins/elements/gstfakesink.c
index 15a1d2a439..1b8e5eaa54 100644
--- a/plugins/elements/gstfakesink.c
+++ b/plugins/elements/gstfakesink.c
@@ -86,7 +86,7 @@ static GType
 gst_fake_sink_state_error_get_type (void)
 {
   static GType fakesink_state_error_type = 0;
-  static GEnumValue fakesink_state_error[] = {
+  static const GEnumValue fakesink_state_error[] = {
     {FAKE_SINK_STATE_ERROR_NONE, "No state change errors", "none"},
     {FAKE_SINK_STATE_ERROR_NULL_READY,
         "Fail state change from NULL to READY", "null-to-ready"},
diff --git a/plugins/elements/gstfakesrc.c b/plugins/elements/gstfakesrc.c
index 28cd63a27d..b2792dfc6e 100644
--- a/plugins/elements/gstfakesrc.c
+++ b/plugins/elements/gstfakesrc.c
@@ -127,7 +127,7 @@ static GType
 gst_fake_src_output_get_type (void)
 {
   static GType fakesrc_output_type = 0;
-  static GEnumValue fakesrc_output[] = {
+  static const GEnumValue fakesrc_output[] = {
     {FAKE_SRC_FIRST_LAST_LOOP, "1", "First-Last loop"},
     {FAKE_SRC_LAST_FIRST_LOOP, "2", "Last-First loop"},
     {FAKE_SRC_PING_PONG, "3", "Ping-Pong"},
@@ -152,7 +152,7 @@ static GType
 gst_fake_src_data_get_type (void)
 {
   static GType fakesrc_data_type = 0;
-  static GEnumValue fakesrc_data[] = {
+  static const GEnumValue fakesrc_data[] = {
     {FAKE_SRC_DATA_ALLOCATE, "Allocate data", "allocate"},
     {FAKE_SRC_DATA_SUBBUFFER, "Subbuffer data", "subbuffer"},
     {0, NULL, NULL},
@@ -170,7 +170,7 @@ static GType
 gst_fake_src_sizetype_get_type (void)
 {
   static GType fakesrc_sizetype_type = 0;
-  static GEnumValue fakesrc_sizetype[] = {
+  static const GEnumValue fakesrc_sizetype[] = {
     {FAKE_SRC_SIZETYPE_EMPTY, "Send empty buffers", "empty"},
     {FAKE_SRC_SIZETYPE_FIXED, "Fixed size buffers (sizemax sized)", "fixed"},
     {FAKE_SRC_SIZETYPE_RANDOM,
@@ -190,7 +190,7 @@ static GType
 gst_fake_src_filltype_get_type (void)
 {
   static GType fakesrc_filltype_type = 0;
-  static GEnumValue fakesrc_filltype[] = {
+  static const GEnumValue fakesrc_filltype[] = {
     {FAKE_SRC_FILLTYPE_NOTHING, "Leave data as malloced", "nothing"},
     {FAKE_SRC_FILLTYPE_ZERO, "Fill buffers with zeros", "zero"},
     {FAKE_SRC_FILLTYPE_RANDOM, "Fill buffers with random crap", "random"},
diff --git a/plugins/elements/gstqueue.c b/plugins/elements/gstqueue.c
index 9f738ccfdf..e71eedf2ae 100644
--- a/plugins/elements/gstqueue.c
+++ b/plugins/elements/gstqueue.c
@@ -173,7 +173,7 @@ static GType
 queue_leaky_get_type (void)
 {
   static GType queue_leaky_type = 0;
-  static GEnumValue queue_leaky[] = {
+  static const GEnumValue queue_leaky[] = {
     {GST_QUEUE_NO_LEAK, "Not Leaky", "no"},
     {GST_QUEUE_LEAK_UPSTREAM, "Leaky on Upstream", "upstream"},
     {GST_QUEUE_LEAK_DOWNSTREAM, "Leaky on Downstream", "downstream"},