diff --git a/ChangeLog b/ChangeLog
index 75a8fb03c..e45838dde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2004-08-28  Moritz Bunkus  <moritz@bunkus.org>
+
+	* mkvmerge, mkvextract, mkvinfo: new feature: Added
+	'TargetTypeValue' as a supported tagging element.
+
+	* mkvmerge, mkvextract, mkvinfo: Complete rewrite of the chapter
+	and tag parsing and output functions. Additions will be much
+	easier now.
+
+	* mkvmerge, mkvextract, mkvinfo: feature removed: Dropped support
+	for the very old and deprecated tagging system. No one used it
+	anyway.
+
 2004-08-24  Moritz Bunkus  <moritz@bunkus.org>
 
 	* mkvmerge: new feature: Allow the use of two-letter ISO639-1
diff --git a/src/common/xml_element_mapping.cpp b/src/common/xml_element_mapping.cpp
index 22cf2e22c..3fa776229 100644
--- a/src/common/xml_element_mapping.cpp
+++ b/src/common/xml_element_mapping.cpp
@@ -53,6 +53,8 @@ namespace libmatroska {
   extern EbmlId KaxTagEditionUID_TheId;
   extern EbmlId KaxTagChapterUID_TheId;
   extern EbmlId KaxTagAttachmentUID_TheId;
+  extern EbmlId KaxTagTargetType_TheId;
+  extern EbmlId KaxTagTargetTypeValue_TheId;
 };
 
 using namespace libmatroska;
@@ -114,6 +116,9 @@ parser_element_t tag_elements[] = {
    NULL, NULL},
   {"AttachmentUID", ebmlt_uint, 3, 0, NO_MAX_VALUE, KaxTagAttachmentUID_TheId,
    NULL, NULL},
+  {"TargetType", ebmlt_string, 3, 0, 0, KaxTagTargetType_TheId, NULL, NULL},
+  {"TargetTypeValue", ebmlt_uint, 3, 0, NO_MAX_VALUE,
+   KaxTagTargetTypeValue_TheId, NULL, NULL},
 
   {"Simple", ebmlt_master, 2, 0, 0, KaxTagSimple_TheId, NULL, NULL},
   {"Name", ebmlt_ustring, 3, 0, 0,  KaxTagName_TheId, NULL, NULL},