diff --git a/ChangeLog b/ChangeLog
index 9c9f1214b..98ef1c9b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-12  Moritz Bunkus  <moritz@bunkus.org>
+
+	* mmg: bug fix: Fixed a crash on loading XML chapters after having
+	saved XML chapters.
+
 2006-11-11  Moritz Bunkus  <moritz@bunkus.org>
 
 	* mmg: new feature: Made the "set the delay input field from the
diff --git a/src/common/chapter_parser_xml.cpp b/src/common/chapter_parser_xml.cpp
index 96d3c8162..e9c16e55a 100644
--- a/src/common/chapter_parser_xml.cpp
+++ b/src/common/chapter_parser_xml.cpp
@@ -185,8 +185,14 @@ parse_xml_chapters(mm_text_io_c *in,
   KaxChapters *chapters;
   EbmlMaster *m;
   string error;
+  int i;
 
   try {
+    for (i = 0; NULL != chapter_elements[i].name; ++i) {
+      chapter_elements[i].start_hook = NULL;
+      chapter_elements[i].end_hook = NULL;
+    }
+
     m = parse_xml_elements("Chapter", chapter_elements, in);
     chapters = dynamic_cast<KaxChapters *>(sort_ebml_master(m));
     assert(chapters != NULL);