diff --git a/ChangeLog b/ChangeLog
index 79c251356..90ddd105e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-12 Riccardo Mottola <rmottola@users.sf.net>
+	
+	* Source/NSSavePanel.m: Return autoreleased copy of the directory
+	string
+
 2009-02-12 Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Tools/make_services.m: Fix error parsing CFBundleURLTypes
diff --git a/Source/NSSavePanel.m b/Source/NSSavePanel.m
index bef312d35..38a2e5515 100644
--- a/Source/NSSavePanel.m
+++ b/Source/NSSavePanel.m
@@ -1113,7 +1113,7 @@ selectCellWithString: (NSString*)title
 - (NSString*) directory
 {
   if (_directory)
-    return _directory;
+    return [NSString stringWithString:_directory];
   else 
     return @"";
 }