diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 391960ae6..3644f1a9e 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,4 +1,5 @@
 2006-11-06  Don Allingham  <don@gramps-project.org>
+	* src/glade/gramps.glade: add tooltips for place buttons
 	* src/GrampsWidgets.py: provide default instructions for place
 	* src/DataViews/_MediaView.py: cancel drag-n-drop if list is empty
 	* src/PageView.py: cancel drag-n-drop if list is empty
diff --git a/gramps2/src/GrampsWidgets.py b/gramps2/src/GrampsWidgets.py
index 35b5aa069..8e59b954e 100644
--- a/gramps2/src/GrampsWidgets.py
+++ b/gramps2/src/GrampsWidgets.py
@@ -518,7 +518,8 @@ class MonitoredDate:
 
 class PlaceEntry:
     """
-    handles the selection of a existing or new Place
+    Handles the selection of a existing or new Place. Supports Drag and Drop
+    to select a place.
     """
     def __init__(self, dbstate, uistate, track, obj, set_val,
                  get_val, add_del, share):
@@ -556,7 +557,7 @@ class PlaceEntry:
         self.share.connect('clicked', self.share_clicked)
         
         if not self.db.readonly and not name:
-            obj.set_text("<i>%s</i>" % _('Drag and drop or use buttons to add or select'))
+            obj.set_text("<i>%s</i>" % _('To select a place, use drag-and-drop or use the buttons'))
             obj.set_use_markup(True)
         else:
             obj.set_text(name)
diff --git a/gramps2/src/glade/gramps.glade b/gramps2/src/glade/gramps.glade
index 9f77b2d02..f232ff04f 100644
--- a/gramps2/src/glade/gramps.glade
+++ b/gramps2/src/glade/gramps.glade
@@ -7194,6 +7194,7 @@
 	      <child>
 		<widget class="GtkButton" id="add_del_place">
 		  <property name="visible">True</property>
+		  <property name="tooltip" translatable="yes">Add a new place</property>
 		  <property name="can_focus">True</property>
 		  <property name="relief">GTK_RELIEF_NONE</property>
 		  <property name="focus_on_click">True</property>
@@ -7252,6 +7253,7 @@
 		  <child>
 		    <widget class="GtkButton" id="select_place">
 		      <property name="visible">True</property>
+		      <property name="tooltip" translatable="yes">Select an existing place</property>
 		      <property name="can_focus">True</property>
 		      <property name="relief">GTK_RELIEF_NONE</property>
 		      <property name="focus_on_click">True</property>
@@ -11183,6 +11185,7 @@
 		      <child>
 			<widget class="GtkButton" id="share_place">
 			  <property name="visible">True</property>
+			  <property name="tooltip" translatable="yes">Select an existing place</property>
 			  <property name="can_focus">True</property>
 			  <property name="relief">GTK_RELIEF_NONE</property>
 			  <property name="focus_on_click">True</property>
@@ -11238,6 +11241,7 @@
 		  <child>
 		    <widget class="GtkButton" id="add_del_place">
 		      <property name="visible">True</property>
+		      <property name="tooltip" translatable="yes">Add a new place</property>
 		      <property name="can_focus">True</property>
 		      <property name="relief">GTK_RELIEF_NONE</property>
 		      <property name="focus_on_click">True</property>