diff --git a/ChangeLog b/ChangeLog
index 104849d6a..fcbb73e6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-03  Moritz Bunkus  <moritz@bunkus.org>
+
+	* mkvmerge: new feature: Added support for the ChapterSegmentUID
+	element.
+
 2005-04-29  Moritz Bunkus  <moritz@bunkus.org>
 
 	* mkvmerge: bug fix: Support WAV files that use other RIFF chunks
diff --git a/src/common/xml_element_mapping.cpp b/src/common/xml_element_mapping.cpp
index 3db4c104c..d6bd8f4f5 100644
--- a/src/common/xml_element_mapping.cpp
+++ b/src/common/xml_element_mapping.cpp
@@ -71,6 +71,7 @@ xml_element_map_init() {
     {"ChapterFlagEnabled", EBMLT_BOOL, 3, 0, 0, no_id, NULL, NULL, NULL},
     {"ChapterPhysicalEquiv", EBMLT_UINT, 3, 0, NO_MAX_VALUE, no_id, NULL,
      NULL, NULL},
+    {"ChapterSegmentUID", EBMLT_BINARY, 3, 16, 16, no_id, NULL, NULL, NULL},
 
     {"ChapterProcess", EBMLT_MASTER, 3, 0, 0, no_id, NULL, NULL, NULL},
     {"ChapterProcessCodecID", EBMLT_UINT, 4, 0, NO_MAX_VALUE, no_id, NULL,