diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 54f16bcb5..9e68a05c5 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-19  Soren Roug  <roug@users.sourceforge.net>
+	* src/WriteXML.py: encode paths for objects in XML to handle
+	&, > and < in paths.
+
 2006-02-19  Don Allingham  <don@gramps-project.org>
 	* src/ImageSelect.py: fix already_loaded initalization
 
diff --git a/gramps2/src/WriteXML.py b/gramps2/src/WriteXML.py
index 1eb39169c..cf8d1c634 100644
--- a/gramps2/src/WriteXML.py
+++ b/gramps2/src/WriteXML.py
@@ -849,7 +849,7 @@ class XmlWriter:
     def write_object(self,obj):
         handle = obj.get_gramps_id()
         mime_type = obj.get_mime_type()
-        path = obj.get_path()
+        path = self.fix(obj.get_path())
         if self.strip_photos:
             path = os.path.basename(path)
         self.g.write('    <object id="%s" handle="%s" change="%d" src="%s" mime="%s"' %