diff --git a/ChangeLog b/ChangeLog
index 6a65058d7..68e128306 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-10-08  Moritz Bunkus  <moritz@bunkus.org>
 
+	* mmg: bug fix: Crash when saving chapters from the chapter
+	editor. Same as the mkvinfo issue below but on all OS.
+
 	* mkvinfo: bug fix: The chapter and tag element tables were not
 	initialized on Windows resulting in a crash when one of those
 	elements was encountered.
diff --git a/src/mmg/mmg.cpp b/src/mmg/mmg.cpp
index f38cd7979..5e7a18bc0 100644
--- a/src/mmg/mmg.cpp
+++ b/src/mmg/mmg.cpp
@@ -49,6 +49,7 @@
 #include "tab_input.h"
 #include "tab_global.h"
 #include "tab_settings.h"
+#include "xml_element_mapping.h"
 
 mmg_app *app;
 mmg_dialog *mdlg;
@@ -1745,6 +1746,7 @@ mmg_app::OnInit() {
   wxString k, v;
 
   cc_local_utf8 = utf8_init(NULL);
+  xml_element_map_init();
 
   cfg = new wxConfig(wxT("mkvmergeGUI"));
   wxConfigBase::Set(cfg);