diff --git a/ChangeLog b/ChangeLog
index 3ef5fd47d..cc988f648 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-03-09  Moritz Bunkus  <moritz@bunkus.org>
 
+	* mkvmerge: bug fix: The segment UID was not generated if
+	splitting was off.
+
 	* mmg: new feature: Automatically set the output file name when
 	the first file is added to the same name but with a '.mkv'
 	extension if it hasn't been set yet. Can be disabled on the
diff --git a/src/mkvmerge.cpp b/src/mkvmerge.cpp
index 91cf927d2..7bace4021 100644
--- a/src/mkvmerge.cpp
+++ b/src/mkvmerge.cpp
@@ -1121,7 +1121,7 @@ render_headers(mm_io_c *rout) {
 
     // Generate the segment UIDs.
     if (!hack_engaged(ENGAGE_NO_VARIABLE_DATA)) {
-      if (first_file) {
+      if (file_num == 1) {
         seguid_current.generate_random();
         seguid_next.generate_random();
       } else {