diff --git a/ChangeLog b/ChangeLog
index e5bbf1bca1..9dac74ffe3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-20  Wim Taymans  <wim.taymans@collabora.co.uk>
+
+	* gst/gstquery.c:
+	* gst/gstquery.h:
+	Add GstQueryType for custom queries instead of having to use the
+	not-so-very-convenient registration infrastructure to register new
+	types.
+
 2008-11-19  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 
 	Patch by: Andrew Feren <acferen at yahoo dot com>
diff --git a/gst/gstquery.c b/gst/gstquery.c
index e07a054580..3e6bad4e79 100644
--- a/gst/gstquery.c
+++ b/gst/gstquery.c
@@ -92,6 +92,7 @@ static GstQueryTypeDefinition standard_definitions[] = {
   {GST_QUERY_CONVERT, "convert", "Converting between formats", 0},
   {GST_QUERY_FORMATS, "formats", "Supported formats for conversion", 0},
   {GST_QUERY_BUFFERING, "buffering", "Buffering status", 0},
+  {GST_QUERY_CUSTOM, "custom", "Custom query", 0},
   {0, NULL, NULL, 0}
 };
 
diff --git a/gst/gstquery.h b/gst/gstquery.h
index 4fa72e0d44..77416330af 100644
--- a/gst/gstquery.h
+++ b/gst/gstquery.h
@@ -48,6 +48,8 @@ G_BEGIN_DECLS
  * @GST_QUERY_FORMATS: query supported formats for convert
  * @GST_QUERY_BUFFERING: query available media for efficient seeking. Since
  * 0.10.20.
+ * @GST_QUERY_CUSTOM: a custom application or element defined query. Since
+ * 0.10.22.
  *
  * Standard predefined Query types
  */
@@ -64,7 +66,8 @@ typedef enum {
   GST_QUERY_SEGMENT,
   GST_QUERY_CONVERT,
   GST_QUERY_FORMATS,
-  GST_QUERY_BUFFERING
+  GST_QUERY_BUFFERING,
+  GST_QUERY_CUSTOM
 } GstQueryType;
 
 /**