diff --git a/ChangeLog b/ChangeLog
index 6da5a2bdd..c288b6c31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-13  Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/GSXibLoader.m: Resolve memory leak for GSXibElement.
+
 2013-02-13  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Headers/AppKit/NSEvent.h
diff --git a/Source/GSXibLoader.m b/Source/GSXibLoader.m
index fd78f3d96..d46cdfe99 100644
--- a/Source/GSXibLoader.m
+++ b/Source/GSXibLoader.m
@@ -452,7 +452,7 @@
     {
       if ([coder containsValueForKey: @"name"])
         {
-          name = [coder decodeObjectForKey: @"name"];
+          ASSIGN(name, [coder decodeObjectForKey: @"name"]);
         }
       if ([coder containsValueForKey: @"object"])
         {
@@ -490,7 +490,7 @@
     {
       if ([coder containsValueForKey: @"name"])
         {
-          name = [coder decodeObjectForKey: @"name"];
+          ASSIGN(name, [coder decodeObjectForKey: @"name"]);
         }
       if ([coder containsValueForKey: @"object"])
         {
@@ -1253,7 +1253,10 @@ didStartElement: (NSString*)elementName
                                            andAttributes: attributeDict];
   NSString *key = [attributeDict objectForKey: @"key"];
   NSString *ref = [attributeDict objectForKey: @"id"];
-  
+
+  // FIXME: We should use proper memory management here
+  AUTORELEASE(element);
+
   if (key != nil)
     {
       [currentElement setElement: element forKey: key];