diff --git a/ChangeLog b/ChangeLog
index 5f14f1859d..a74bb4b3b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-07  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/gstindex.c: (gst_index_resolver_get_type):
+	  Don't put descriptions into the nick field of a GEnumValue: it's not
+	  meant for that and some language bindings rely on the nick field to
+	  construct constants and the like. Fixes #526705.
+
 2008-04-07  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* NEWS:
diff --git a/gst/gstindex.c b/gst/gstindex.c
index a8c779b56c..924b6e9798 100644
--- a/gst/gstindex.c
+++ b/gst/gstindex.c
@@ -94,12 +94,9 @@ gst_index_resolver_get_type (void)
 {
   static GType index_resolver_type = 0;
   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",
-        "Resolve an object to its GType[.padname]"},
-    {GST_INDEX_RESOLVER_PATH, "GST_INDEX_RESOLVER_PATH",
-        "Resolve an object to its path in the pipeline"},
+    {GST_INDEX_RESOLVER_CUSTOM, "GST_INDEX_RESOLVER_CUSTOM", "custom"},
+    {GST_INDEX_RESOLVER_GTYPE, "GST_INDEX_RESOLVER_GTYPE", "gtype"},
+    {GST_INDEX_RESOLVER_PATH, "GST_INDEX_RESOLVER_PATH", "path"},
     {0, NULL, NULL},
   };