diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 857084d91..8255dbe76 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,6 @@
+2006-07-16  Alex Roitman  <shura@gramps-project.org>
+	* src/plugins/Checkpoint.py (Checkpoint.run_tool): Add busy cursor.
+
 2006-07-16  Zsolt Foldvari  <zsolt.foldvari@nokia.com>
 	* src/ViewManager.py: Custom name format support.
 	* src/GrampsCfg.py: Custom name format support.
diff --git a/gramps2/src/plugins/Checkpoint.py b/gramps2/src/plugins/Checkpoint.py
index 47032572d..4d9866906 100644
--- a/gramps2/src/plugins/Checkpoint.py
+++ b/gramps2/src/plugins/Checkpoint.py
@@ -201,6 +201,9 @@ class Checkpoint(Tool.Tool, ManagedWindow.ManagedWindow):
         """
         if not cli:
             self.uistate.status_text(_("Checkpointing database..."))
+            self.uistate.window.window.set_cursor(
+                gtk.gdk.Cursor(gtk.gdk.WATCH))
+            self.window.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH))
 
         if self.options.handler.options_dict['rcs']:
             self.rcs(archive,cli)
@@ -210,6 +213,8 @@ class Checkpoint(Tool.Tool, ManagedWindow.ManagedWindow):
             self.custom(self.options.handler.options_dict['crcmd'],False,cli)
         
         if not cli:
+            self.uistate.window.window.set_cursor(None)
+            self.window.window.set_cursor(None)
             self.uistate.pulse_progressbar(0)
             self.uistate.modify_statusbar()