diff --git a/ChangeLog b/ChangeLog
index 59c281d15..237d4526e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-03-19  Moritz Bunkus  <moritz@bunkus.org>
 
+	* mkvmerge: bug fix: Splitting by time was broken for audio-only
+	files.
+
 	* mkvmerge: bug fix: The --fourcc switch was not working.
 
 2005-03-16  Moritz Bunkus  <moritz@bunkus.org>
diff --git a/src/merge/cluster_helper.cpp b/src/merge/cluster_helper.cpp
index 3b3df1e9e..a83c2c962 100644
--- a/src/merge/cluster_helper.cpp
+++ b/src/merge/cluster_helper.cpp
@@ -163,7 +163,8 @@ cluster_helper_c::add_packet(packet_t *packet) {
       if ((header_overhead + additional_size + bytes_in_file) >= split_after)
         split = true;
 
-    } else if ((packet->assigned_timecode - first_timecode_in_file) >=
+    } else if ((0 <= first_timecode_in_file) && 
+               (packet->assigned_timecode - first_timecode_in_file) >=
                (split_after * 1000000ull))
       split = true;
 
diff --git a/src/merge/output_control.cpp b/src/merge/output_control.cpp
index 864675d0a..fd7e2dad9 100644
--- a/src/merge/output_control.cpp
+++ b/src/merge/output_control.cpp
@@ -636,7 +636,8 @@ render_headers(mm_io_c *rout) {
       for (i = 0; i < packetizers.size(); i++)
         if (packetizers[i].packetizer != NULL)
           packetizers[i].packetizer->fix_headers();
-    }
+    } else
+      set_timecode_scale();
 
     kax_infos->Render(*rout, true);
     kax_sh_main->IndexThis(*kax_infos, *kax_segment);