diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 8448250ad..eda156a08 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-06  Martin Hawlisch  <Martin.Hawlisch@gmx.de>
+	* src/gramps_main.py (undo): Block signals during undo to make
+	it MUCH faster when undoing larger imports or plugin runs
+	
 2005-05-05  Alex Roitman  <shura@gramps-project.org>
 	* doc/gramps.1.in, doc/gramps-manual/C/bugs.xml,
 	doc/gramps-manual/C/cmdline.xml, doc/gramps-manual/C/faq.xml,
diff --git a/gramps2/src/gramps_main.py b/gramps2/src/gramps_main.py
index adcef6126..b049cfb36 100755
--- a/gramps2/src/gramps_main.py
+++ b/gramps2/src/gramps_main.py
@@ -521,7 +521,10 @@ class Gramps(GrampsDBCallback.GrampsDBCallback):
         if self.undo_active:
             return
         self.undo_active = True
+        self.db.disable_signals()
         self.db.undo()
+        self.db.enable_signals()
+        self.db.request_rebuild()        
         if self.active_person:
             p = self.db.get_person_from_handle(self.active_person.get_handle())
             self.change_active_person(p)