diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 8f1d76a55..e28b0fa3f 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -10,7 +10,9 @@
 
 	* src/DisplayState.py: Factor out recursive action function.
 	* src/EditPerson.py: Use person handle to identify the window.
-	* src/EventEdit.py: Use more descriptive menu label.	
+	* src/EventEdit.py: Use more descriptive menu label.
+	* src/GrampsDb/_GrampsBSDDB.py (gramps_upgrade_9): Convert witness
+	comment to the EventRef note for old witness_by_ID references.
 
 2005-12-21 Richard Taylor <rjt-gramps@thegrindstone.me.uk>
 	* src/EditSource.py: fixed small mistake in display_references
diff --git a/gramps2/src/GrampsDb/_GrampsBSDDB.py b/gramps2/src/GrampsDb/_GrampsBSDDB.py
index b7987d94a..fe578257a 100644
--- a/gramps2/src/GrampsDb/_GrampsBSDDB.py
+++ b/gramps2/src/GrampsDb/_GrampsBSDDB.py
@@ -1220,6 +1220,9 @@ class GrampsBSDDB(GrampsDbBase):
                     event_ref = EventRef()
                     event_ref.ref = event.handle
                     event_ref.role = (EventRef.WITNESS,'')
+                    # Add comment
+                    if witness.comment:
+                        event_ref.set_note(witness.comment)
                     person = self.get_person_from_handle(witness.val)
                     person.event_ref_list.append(event_ref)
                     self.commit_person(person,trans)