diff --git a/ChangeLog b/ChangeLog
index d9a2b8ea6..cfa89f594 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 2004-08-22  Tim Waugh  <twaugh@redhat.com>
+
+	* src/ReadXML.py (GrampsParser.start_object): Set GRAMPS ID.
+
 	* src/WriteXML.py (write_xml_data): Fixed typo causing XML export to
 	omit all place definitions.
 	(XmlWriter.write_xml_data): Sort person IDs before writing.
@@ -8,6 +11,8 @@
 	(XmlWriter.write_xml_data): Sort family IDs before writing.
 	(XmlWriter.write_xml_data): Fixed families output by preventing
 	confusion between handles and GRAMPS IDs.
+	(XmlWriter.write_xml_data): Sort object IDs before writing.
+	(XmlWriter.write_object): Use GRAMPS ID not DB handle.
 
 	* src/RelLib.py (probably_alive): Fixed typo (bug #1012347).
 
diff --git a/src/ReadXML.py b/src/ReadXML.py
index 966c6e9fa..0ddb4c423 100644
--- a/src/ReadXML.py
+++ b/src/ReadXML.py
@@ -762,6 +762,7 @@ class GrampsParser:
 
     def start_object(self,attrs):
         self.object = self.db.find_object_from_handle(attrs['id'],self.trans)
+        self.object.set_gramps_id(attrs['id'])
         self.object.set_mime_type(attrs['mime'])
         self.object.set_description(attrs['description'])
         src = attrs["src"]