diff --git a/ChangeLog b/ChangeLog
index d57e795ba..a63ec69bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-03 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/GSNibLoading.m (NSButtonImageSource -initWithCoder:): Add
+	missing retain of the named image.
+
 2009-02-03 Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSTextContainer.m: Add some frame size checks.
diff --git a/Source/GSNibLoading.m b/Source/GSNibLoading.m
index a200106a4..c3c1b3213 100644
--- a/Source/GSNibLoading.m
+++ b/Source/GSNibLoading.m
@@ -205,6 +205,8 @@ static BOOL _isInInterfaceBuilder = NO;
 @implementation NSView (NibCompatibility)
 - (void) _setWindow: (id) w
 {
+  // FIXME: Why is this an ASSIGN? The view is held by the window 
+  // not the othe way around.
   ASSIGN(_window,w);
 }
 
@@ -703,6 +705,7 @@ static BOOL _isInInterfaceBuilder = NO;
 	    }
 	}
       
+      // FIXME: Should release self
       return _realObject;
     }
   else
@@ -801,6 +804,7 @@ static BOOL _isInInterfaceBuilder = NO;
 
 - (id) initWithCoder: (NSCoder *)aCoder
 {
+  // FIXME: Should release self
   return nil;
 }
 
@@ -1444,6 +1448,7 @@ static BOOL _isInInterfaceBuilder = NO;
                    NSStringFromClass([coder class])];
     }
 
+  // FIXME: Needs to release self
   return _template;
 }
 
@@ -2044,7 +2049,7 @@ static BOOL _isInInterfaceBuilder = NO;
     }
 
   RELEASE(self);
-  return [NSImage imageNamed: imageName];
+  return RETAIN([NSImage imageNamed: imageName]);
 }
 
 - (void) encodeWithCoder: (NSCoder *)coder
@@ -2208,6 +2213,7 @@ static BOOL _isInInterfaceBuilder = NO;
                                     exponent: exponent
                                     isNegative: negative];
     }
+  // FIXME: Needs to release self
   return dn;
 }