diff --git a/ChangeLog b/ChangeLog
index 595d19b5d..d68fe2ee9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-08-16 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSSplitView.m (-setAutosaveName:): Treat an empty
+	autosaveName as nil to fix problem with some nibs.
+	Patch by Doug Simons <doug.simons@testplant.com>
+
 2015-08-14 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSMatrix.m: Warn about wrong cell array size on
diff --git a/Source/NSSplitView.m b/Source/NSSplitView.m
index cad6835a8..f6a19ae6e 100644
--- a/Source/NSSplitView.m
+++ b/Source/NSSplitView.m
@@ -1049,6 +1049,10 @@ static inline NSPoint centerSizeInRect(NSSize innerSize, NSRect outerRect)
 
 - (void) setAutosaveName: (NSString *)autosaveName
 {
+  if ([autosaveName length] == 0)
+    {
+      autosaveName = nil;
+    }
   ASSIGN(_autosaveName, autosaveName);
 }