diff --git a/ChangeLog b/ChangeLog
index 5bbd5e4fd7..a438623b26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-05-15  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/subparse/gstsubparse.c:
+	(gst_sub_parse_data_format_autodetect):
+	  Improve SAMI typefinding: handle case where there are
+	  whitespaces or newlines in front of the first <SAMI>
+	  tag (#169936).
+
 2006-05-15  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* configure.ac:
diff --git a/gst/subparse/gstsubparse.c b/gst/subparse/gstsubparse.c
index 8e2f6bf99a..4b7d1150d8 100644
--- a/gst/subparse/gstsubparse.c
+++ b/gst/subparse/gstsubparse.c
@@ -626,7 +626,7 @@ gst_sub_parse_data_format_autodetect (gchar * match_str)
     GST_LOG ("MPSub (time based) format detected");
     return GST_SUB_PARSE_FORMAT_MPSUB;
   }
-  if (!g_ascii_strncasecmp (match_str, "<SAMI>", 6)) {
+  if (xmlStrcasestr ((const xmlChar *) match_str, (xmlChar *) "<SAMI>")) {
     GST_LOG ("SAMI (time based) format detected");
     return GST_SUB_PARSE_FORMAT_SAMI;
   }