diff --git a/ChangeLog b/ChangeLog
index 4f86a54d6..dca9363a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-06-23  Moritz Bunkus  <moritz@bunkus.org>
 
+	* mkvmerge: bug fix: The 'default track' flag was set to 'yes' for
+	tracks read from Matroska files even if 'no' was specified on the
+	command line.
+
 	* mkvextract: new feature: Added support for the 'header removal'
 	encoding scheme.
 
diff --git a/src/merge/pr_generic.cpp b/src/merge/pr_generic.cpp
index 7a5689a25..dbac0da60 100644
--- a/src/merge/pr_generic.cpp
+++ b/src/merge/pr_generic.cpp
@@ -642,6 +642,8 @@ generic_packetizer_c::set_headers() {
     set_as_default_track(idx, DEFAULT_TRACK_PRIORITY_FROM_TYPE);
   else if (ti.default_track)
     set_as_default_track(idx, DEFAULT_TRACK_PRIORITY_CMDLINE);
+  else if (default_tracks[idx] == hserialno)
+    default_tracks[idx] = 0;
 
   if (ti.language != "")
     *(static_cast<EbmlString *>