diff --git a/ChangeLog b/ChangeLog
index a890beb19b..6fc3959b17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-02-18  David Schleef  <ds@schleef.org>
+
+	* ext/gdk_pixbuf/gstgdkpixbuf.c: (plugin_init): Disable gdk_pixbuf
+	typefinding, since it seems to be worse than nothing.
+	* gst/typefind/gsttypefindfunctions.c: (qt_type_find):  Add ftyp
+	atom to recognize .mp4 and .m4a files as video/quicktime.
+
 2004-02-18  David Schleef  <ds@schleef.org>
 
 	* gst/sine/demo-dparams.c: (quit_live),
diff --git a/gst/typefind/gsttypefindfunctions.c b/gst/typefind/gsttypefindfunctions.c
index 5bcd3547e3..5cf281d384 100644
--- a/gst/typefind/gsttypefindfunctions.c
+++ b/gst/typefind/gsttypefindfunctions.c
@@ -710,6 +710,7 @@ qt_type_find (GstTypeFind *tf, gpointer unused)
 	strncmp (&data[4], "mdat", 4) != 0 &&
 	strncmp (&data[4], "pnot", 4) != 0 &&
 	strncmp (&data[4], "PICT", 4) != 0 &&
+	strncmp (&data[4], "ftyp", 4) != 0 &&
 	strncmp (&data[4], "free", 4) != 0) {
       tip = 0;
       break;