diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index d1d9938e1..c3196acca 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -19,6 +19,9 @@
 
 	* src/data/tips.xml: Update tips.
 
+	* src/WriteXML.py (write_witness): Proper witness reference.
+	* src/ReadXML.py (start_witness): Initialize empty comment.
+
 2005-05-10  Julio Sanchez  <jsanchez@users.sourceforge.net>
 	* src/po/es.po: Updated translation
 	* src/plugins/rel_es.py: Revert to more conservative relationships
diff --git a/gramps2/src/ReadXML.py b/gramps2/src/ReadXML.py
index 49948b820..93c3c8ed2 100644
--- a/gramps2/src/ReadXML.py
+++ b/gramps2/src/ReadXML.py
@@ -650,6 +650,7 @@ class GrampsParser:
 
     def start_witness(self,attrs):
         self.in_witness = 1
+        self.witness_comment = ""
         if attrs.has_key('hlink'):
             self.witness = RelLib.Witness(RelLib.Event.ID,attrs['hlink'])
         elif attrs.has_key('ref'):
diff --git a/gramps2/src/WriteXML.py b/gramps2/src/WriteXML.py
index b4f1756ac..3d9796ea8 100644
--- a/gramps2/src/WriteXML.py
+++ b/gramps2/src/WriteXML.py
@@ -477,15 +477,13 @@ class XmlWriter:
             sp = "  "*index
             com = self.fix(w.get_comment())
             if w.get_type() == RelLib.Event.ID:
-                self.g.write('%s<witness>\n' % sp)
-                self.g.write('  %s<hlink>%s</hlink>\n' % (sp,w.get_value()))
+                self.g.write('%s<witness hlink="%s">\n' % (sp,w.get_value()))
                 if com:
                     self.g.write('  %s<comment>%s</comment>\n' % (sp,com))
                 self.g.write('%s</witness>\n' % sp)
             else:
                 nm = self.fix(w.get_value())
-                self.g.write('%s<witness>\n' % sp)
-                self.g.write('  %s<name>%s</name>\n' % (sp,nm))
+                self.g.write('%s<witness name="%s">\n' % (sp,nm))
                 if com:
                     self.g.write('  %s<comment>%s</comment>\n' % (sp,com))
                 self.g.write('%s</witness>\n' % sp)