diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index d4018cd5c..87792cdfe 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,6 @@
+2003-06-13  Tim Waugh  <twaugh@redhat.com>
+	* src/docgen/OpenOfficeDoc.py: Escape special XML characters. 
+
 2003-06-12  Tim Waugh  <twaugh@redhat.com>
 	* src/docgen/OpenOfficeDoc.py: Surround images by paragraph tags
 	when inside the table cell. 
diff --git a/gramps2/src/docgen/OpenOfficeDoc.py b/gramps2/src/docgen/OpenOfficeDoc.py
index d1065f52f..79edd86a6 100644
--- a/gramps2/src/docgen/OpenOfficeDoc.py
+++ b/gramps2/src/docgen/OpenOfficeDoc.py
@@ -521,6 +521,9 @@ class OpenOfficeDoc(TextDoc.TextDoc):
         self.new_cell = 1
 
     def write_text(self,text):
+        text = string.replace(text,'&','&amp;');       # Must be first
+        text = string.replace(text,'<','&lt;');
+        text = string.replace(text,'>','&gt;');
         text = string.replace(text,'\n','<text:line-break/>')
 	self.f.write(text)