diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 61448167b..9468c1a1e 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,4 +1,5 @@
 2006-04-26  Alex Roitman  <shura@gramps-project.org>
+	* src/plugins/Checkpoint.py: Fix wm.
 	* src/plugins/ReorderIds.py: Adapt to new API; rebuild for Events
 	and Repositories.
 	* src/GrampsLogger/_ErrorReportAssistant.py
diff --git a/gramps2/src/plugins/Checkpoint.py b/gramps2/src/plugins/Checkpoint.py
index a6e9601fc..47032572d 100644
--- a/gramps2/src/plugins/Checkpoint.py
+++ b/gramps2/src/plugins/Checkpoint.py
@@ -149,14 +149,11 @@ class Checkpoint(Tool.Tool, ManagedWindow.ManagedWindow):
         self.rcs_rb.connect('toggled',self.rcs_toggled)
 
         self.title = _("Checkpoint Data")
-        self.window = self.glade.get_widget('top')
-        Utils.set_titles(self.window,
-                         self.glade.get_widget('title'),
-                         self.title)
+        window = self.glade.get_widget('top')
+        self.set_window(window,self.glade.get_widget('title'),self.title)
 
         self.glade.signal_autoconnect({
             "on_close_clicked" : self.close,
-            "on_delete_event"  : self.on_delete_event,
             "on_arch_clicked"  : self.on_archive_clicked,
             "on_ret_clicked"   : self.on_retrieve_clicked,
             "on_help_clicked"  : self.on_help_clicked,
@@ -164,6 +161,9 @@ class Checkpoint(Tool.Tool, ManagedWindow.ManagedWindow):
 
         self.show()
 
+    def build_menu_names(self,obj):
+        return (_("Checkpoint tool"),None)
+
     def rcs_toggled(self,obj):
         self.cust_arch_cb.set_sensitive(not obj.get_active())
         self.cust_ret_cb.set_sensitive(not obj.get_active())
@@ -172,12 +172,6 @@ class Checkpoint(Tool.Tool, ManagedWindow.ManagedWindow):
         """Display the relevant portion of GRAMPS manual"""
         GrampsDisplay.help('index')
 
-    def on_delete_event(self,obj,b):
-        self.remove_itself_from_menu()
-
-    def close(self,obj):
-        self.window.destroy()
-
     def on_archive_clicked(self,obj):
         self.options.handler.options_dict['cacmd'] = unicode(
             self.cust_arch_cb.get_text())