diff --git a/ChangeLog b/ChangeLog
index af478ca54..b4efd58dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-07 Riccardo Mottola <rm@gnu.org>
+
+	* Source/NSSavePanel.m (initWithoutGModel):
+	Add tooltips to buttons.
+
 2013-02-06  Quentin Mathe <quentin.mathe@gmail.com>
 
 	* Source/NSView.m (-encodeWithCoder:): Fixed to encode the superview 
diff --git a/Source/NSSavePanel.m b/Source/NSSavePanel.m
index 23ed17452..fc9a9f578 100644
--- a/Source/NSSavePanel.m
+++ b/Source/NSSavePanel.m
@@ -273,6 +273,7 @@ setPath(NSBrowser *browser, NSString *path)
   [button setAction: @selector(_setHomeDirectory)];
   [button setAutoresizingMask: NSViewMinXMargin];
   [button setTag: NSFileHandlingPanelHomeButton];
+  [button setToolTip:_(@"Home")];
   [_bottomView addSubview: button];
   [lastKeyView setNextKeyView: button];
   lastKeyView = button;
@@ -288,6 +289,7 @@ setPath(NSBrowser *browser, NSString *path)
   [button setAction: @selector(_mountMedia)];
   [button setAutoresizingMask: NSViewMinXMargin];
   [button setTag: NSFileHandlingPanelDiskButton];
+  [button setToolTip:_(@"Mount")];
   [_bottomView addSubview: button];
   [lastKeyView setNextKeyView: button];
   lastKeyView = button;
@@ -303,6 +305,7 @@ setPath(NSBrowser *browser, NSString *path)
   [button setAction: @selector(_unmountMedia)];
   [button setAutoresizingMask: NSViewMinXMargin];
   [button setTag: NSFileHandlingPanelDiskEjectButton];
+  [button setToolTip:_(@"Unmount")];
   [_bottomView addSubview: button];
   [lastKeyView setNextKeyView: button];
   lastKeyView = button;