diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index d0175acb2..0756d482c 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -5,6 +5,8 @@
 2005-06-22  Alexander Roitman  <shura@gramps-project.org>
 	* src/GenericFilter.py (IsDescendantOfFilterMatch.__init__):
 	Remove unneeded method.
+	* src/FamilyView.py (remove_child_clicked): Prevent signal race.
+	* NEWS: Update.
 
 2005-06-21  Don Allingham  <don@gramps-project.org>
 	* src/GenericFilter.py: optimize a few filters
diff --git a/gramps2/NEWS b/gramps2/NEWS
index 66acad354..31f663c00 100644
--- a/gramps2/NEWS
+++ b/gramps2/NEWS
@@ -1,3 +1,11 @@
+Version 2.0.4 -- the "That's enough music for now, lads." release
+* Speedups for "select" dialogs in Family View.
+* Filters are working in reports again.
+* vCal and vCard plugins are back.
+* Gender guessing is back for new people.
+* GEDCOM export fixes.
+* Other bug fixes.
+
 Version 2.0.3 -- the "Mynd you, møøse bites Kan be pretty nasti..." release
 * Fixed Date handler bug that would not allow dates to be updated.
 
diff --git a/gramps2/src/FamilyView.py b/gramps2/src/FamilyView.py
index 053d6c790..fb16238b1 100644
--- a/gramps2/src/FamilyView.py
+++ b/gramps2/src/FamilyView.py
@@ -833,10 +833,13 @@ class FamilyView:
             elif family.get_mother_handle() == None:
                 self.delete_family_from(family.get_father_handle(),trans)
 
+        self.parent.db.disable_all_signals()
         self.parent.db.commit_person(child,trans)
         self.parent.db.commit_family(family,trans)
         n = child.get_primary_name().get_regular_name()
         self.parent.db.transaction_commit(trans,_("Remove Child (%s)") % n)
+        self.parent.db.enable_all_signals()
+        self.parent.db.emit('family-update',([family.get_handle()],))
 
     def remove_spouse(self,obj):
         if self.selected_spouse:
@@ -1137,6 +1140,7 @@ class FamilyView:
             return
 
         hlist = family.get_child_handle_list()
+
         self.child_model = DisplayModels.ChildModel(hlist,self.parent.db)
         self.child_list.set_model(self.child_model)
         self.family = self.parent.db.get_family_from_handle(family.get_handle())