diff --git a/ChangeLog b/ChangeLog
index 108dbadf29..df2bf312c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-10-10  Tim-Philipp Müller  <tim at centricular dot net>
+
+	Patch by: Ferenc Gerlits  <fgerlits at gmail com>
+
+	* gst/typefind/gsttypefindfunctions.c:
+	  Recognise XML files and XML-like files shorter than 256 bytes as
+	  well (fixes #359237).
+
 2006-10-09  Edgard Lima <edgard.lima@indt.org.br>
 
 	Patch by: Renato Filho <renato.filho@indt.org.br>
diff --git a/gst/typefind/gsttypefindfunctions.c b/gst/typefind/gsttypefindfunctions.c
index f783b40d1a..28e1ad6d68 100644
--- a/gst/typefind/gsttypefindfunctions.c
+++ b/gst/typefind/gsttypefindfunctions.c
@@ -185,7 +185,7 @@ uri_type_find (GstTypeFind * tf, gpointer unused)
 
 /*** application/xml **********************************************************/
 
-#define XML_BUFFER_SIZE 256
+#define XML_BUFFER_SIZE 16
 #define XML_INC_BUFFER {                                                \
   pos++;                                                                \
   if (pos == XML_BUFFER_SIZE) {                                         \