diff --git a/ChangeLog b/ChangeLog
index 61bad81fa..8785ea3d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-05  Moritz Bunkus  <moritz@bunkus.org>
+
+	* all: bug fix: EBML void elements will be skipped when reading
+	structures from XML (e.g. chapters). Fixes #802.
+
 2012-12-02  Moritz Bunkus  <moritz@bunkus.org>
 
 	* all: bug fix: EBML void elements will be skipped when saving
diff --git a/src/common/xml/ebml_converter.cpp b/src/common/xml/ebml_converter.cpp
index 9c34e2b76..33c61c718 100644
--- a/src/common/xml/ebml_converter.cpp
+++ b/src/common/xml/ebml_converter.cpp
@@ -361,6 +361,10 @@ void
 ebml_converter_c::to_ebml_recursively(EbmlMaster &parent,
                                       pugi::xml_node &node)
   const {
+  // Skip <EBMLVoid> elements.
+  if (std::string(node.name()) == "EBMLVoid")
+    return;
+
   std::map<std::string, bool> handled_attributes;
 
   auto converted_node   = convert_node_or_attribute_to_ebml(parent, node, pugi::xml_attribute{}, handled_attributes);