diff --git a/ChangeLog b/ChangeLog
index 67f2f0362..dd6a0778e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-13  Moritz Bunkus  <moritz@bunkus.org>
+
+	* mkvmerge: bug fix: The Quicktime/MP4 reader wasn't skipping
+	unknown elements correctly.
+
 2005-08-03  Moritz Bunkus  <moritz@bunkus.org>
 
 	* mkvextract: new feature: Added a new extraction mode for
diff --git a/src/input/r_qtmp4.cpp b/src/input/r_qtmp4.cpp
index 1d73c5fba..54a3351c6 100644
--- a/src/input/r_qtmp4.cpp
+++ b/src/input/r_qtmp4.cpp
@@ -172,15 +172,9 @@ qtmp4_reader_c::parse_headers() {
       mdat_size = atom.size;
       skip_atom();
 
-    } else if ((atom.fourcc == FOURCC('f', 'r', 'e', 'e')) ||
-               (atom.fourcc == FOURCC('s', 'k', 'i', 'p')) ||
-               (atom.fourcc == FOURCC('j', 'u', 'n', 'k')) ||
-               (atom.fourcc == FOURCC('p', 'n', 'o', 't')) ||
-               (atom.fourcc == FOURCC('P', 'I', 'C', 'T'))) {
+    } else
       skip_atom();
 
-    }
-
   } while (!io->eof() && (!headers_parsed || (mdat_pos == -1)));
 
   if (!headers_parsed)