diff --git a/ChangeLog b/ChangeLog
index 2c3c2b685..94ae6e126 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-04  Moritz Bunkus  <moritz@bunkus.org>
+
+	* mkvmerge: bug fix: use the same UID for the EditionUID in the
+	chapters and in the tag targets when parsing a CUE sheet.
+
 2004-08-02  Moritz Bunkus  <moritz@bunkus.org>
 
 	* mkvmerge/mkvextract: new feature: Use the new EditionUID entries
diff --git a/src/common/chapter_parser_cue.cpp b/src/common/chapter_parser_cue.cpp
index 49a821567..116d9c748 100644
--- a/src/common/chapter_parser_cue.cpp
+++ b/src/common/chapter_parser_cue.cpp
@@ -307,7 +307,6 @@ add_elements_for_cue_entry(cue_parser_args_t &a,
 
   if (a.edition == NULL) {
     a.edition = &GetChild<KaxEditionEntry>(*a.chapters);
-    a.edition_uid = create_unique_uint32();
     *static_cast<EbmlUInteger *>(&GetChild<KaxEditionUID>(*a.edition)) =
       a.edition_uid;
   }
@@ -409,6 +408,7 @@ parse_cue_chapters(mm_text_io_c *in,
   a.line_num = 0;
   a.start_00 = -1;
   a.start_01 = -1;
+  a.edition_uid = create_unique_uint32();
   try {
     while (in->getline2(line)) {
       a.line_num++;