diff --git a/ChangeLog b/ChangeLog
index 659512c8f1..741773fcb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-22  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	Patch by: Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/typefind/gsttypefindfunctions.c: (qt_type_find):
+	  fix typefinding on some ISO files.  Fixes #339212.
+
 2006-04-22  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	Patch by: Tim-Philipp Müller  <tim at centricular dot net>
diff --git a/gst/typefind/gsttypefindfunctions.c b/gst/typefind/gsttypefindfunctions.c
index eec4c49958..c2f2e8a662 100644
--- a/gst/typefind/gsttypefindfunctions.c
+++ b/gst/typefind/gsttypefindfunctions.c
@@ -1453,6 +1453,7 @@ qt_type_find (GstTypeFind * tf, gpointer unused)
         STRNCMP (&data[4], "mdat", 4) == 0 ||
         STRNCMP (&data[4], "ftyp", 4) == 0 ||
         STRNCMP (&data[4], "free", 4) == 0 ||
+        STRNCMP (&data[4], "uuid", 4) == 0 ||
         STRNCMP (&data[4], "skip", 4) == 0) {
       if (tip == 0) {
         tip = GST_TYPE_FIND_LIKELY;