diff --git a/ChangeLog b/ChangeLog
index 3f8928e5c..d3b6aed32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-04  Wolfgang Lux  <wolfgang.lux@gmail.com>
+
+	* Source/NSSavePanel.m (-ok:): Restore ability to create nested
+	directories, which was removed without reason during the last
+	change of NSSavePanel.
+
 2012-09-03 22:35-EDT Gregory John Casamento <greg.casamento@gmail.com>
 
 	* Source/GSXibLoader.m: Remove test code.
@@ -21,7 +27,6 @@
 	* Source/GSToolTips.m (_timedOut:): Don't display the tooltip
 	window (GSTTPanel) if the tooltip is nil or is an empty string.
 
->>>>>>> .r35509
 2012-09-02 13:56-EDT Gregory John Casamento <greg.casamento@gmail.com>
 
 	* Source/GSXibLoader.m: Correct issue with reuse of enumerator.
diff --git a/Source/NSSavePanel.m b/Source/NSSavePanel.m
index 619ad8fc9..1f71f3755 100644
--- a/Source/NSSavePanel.m
+++ b/Source/NSSavePanel.m
@@ -231,8 +231,8 @@ setPath(NSBrowser *browser, NSString *path)
   [_browser setAllowsMultipleSelection: NO];
   [_browser setAutoresizingMask: NSViewWidthSizable|NSViewHeightSizable];
   [_browser setTag: NSFileHandlingPanelBrowser];
-  [_browser setAction:@selector(_selectText:)];
-  [_browser setTarget:self];
+  [_browser setAction: @selector(_selectText:)];
+  [_browser setTarget: self];
   [_browser setMinColumnWidth: 140];
   [_topView addSubview: _browser];
   [_browser release];
@@ -1344,7 +1344,10 @@ selectCellWithString: (NSString*)title
 
       if (result == NSAlertDefaultReturn)
 	{
-	  if ([_fm createDirectoryAtPath: filename attributes: nil] == NO)
+	  if ([_fm createDirectoryAtPath: filename
+	     withIntermediateDirectories: YES
+			      attributes: nil
+				   error: NULL] == NO)
 	    {
 	      NSRunAlertPanel(_(@"Save"),
 		_(@"The directory '%@' could not be created."),