diff --git a/ChangeLog b/ChangeLog
index 549c74767..9feb01751 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2007-04-19  Brian Matherly  <brian@gramps-project.org>
+	* src/docgen/ODFDoc.py: PROPERLY escape ampersands
+
 2007-04-19  Martin Hawlisch  <Martin.Hawlisch@gmx.de>
 	* src/DisplayModels/_NoteModel.py: colorize using marker
 
diff --git a/src/docgen/ODFDoc.py b/src/docgen/ODFDoc.py
index ff7b3e000..260e87463 100644
--- a/src/docgen/ODFDoc.py
+++ b/src/docgen/ODFDoc.py
@@ -998,7 +998,7 @@ class ODFDoc(BaseDoc.BaseDoc):
         self.cntnt.write('<text:p text:style-name="X%s"> ' % pname)
 
         self.cntnt.write('<text:span text:style-name="F%s">\n' % pname)
-        self.write_text('\n'.join(escape(text)))
+        self.write_text(escape('\n'.join(text)))
         self.cntnt.write('</text:span>\n</text:p>\n</draw:text-box>\n')
         self.cntnt.write('</draw:frame>\n')