diff --git a/ChangeLog b/ChangeLog
index 0effcdd29..a2501a2fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-08  Moritz Bunkus  <moritz@bunkus.org>
+
+	* mkvmerge: bug fix: Track names could not be set to be empty.
+
 2005-02-06  Moritz Bunkus  <moritz@bunkus.org>
 
 	* Released v1.0.2.
diff --git a/src/mmg/mmg.cpp b/src/mmg/mmg.cpp
index b7fc9784b..d239fcc0c 100644
--- a/src/mmg/mmg.cpp
+++ b/src/mmg/mmg.cpp
@@ -1385,12 +1385,9 @@ mmg_dialog::update_command_line() {
     clargs.Add(a->file_name);
   }
 
-  if (global_page->tc_title->GetValue().Length() > 0) {
+  if (title_was_present || (global_page->tc_title->GetValue().Length() > 0)) {
     clargs.Add(wxT("--title"));
     clargs.Add(global_page->tc_title->GetValue());
-  } else if (title_was_present) {
-    clargs.Add(wxT("--title"));
-    clargs.Add(wxT(""));
   }
 
   if (global_page->cb_split->IsChecked()) {