@@ -20,16 +20,16 @@
 
 #import "OFNumber.h"
 #import "OFString.h"
 #import "OFXMLElement.h"
 #import "OFXMLAttribute.h"
-#import "OFAutoreleasePool.h"
 
 #import "OFInvalidArgumentException.h"
 #import "OFInvalidFormatException.h"
 #import "OFNotImplementedException.h"
 
+#import "autorelease.h"
 #import "macros.h"
 
 #define RETURN_AS(t)							\
 	switch (type) {							\
 	case OF_NUMBER_BOOL:						\
@@ -717,11 +717,11 @@
 - initWithSerialization: (OFXMLElement*)element
 {
 	self = [super init];
 
 	@try {
-		OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
+		void *pool = objc_autoreleasePoolPush();
 		OFString *typeString;
 
 		if (![[element name] isEqual: [self className]] ||
 		    ![[element namespace] isEqual: OF_SERIALIZATION_NS])
 			@throw [OFInvalidArgumentException
@@ -774,11 +774,11 @@
 		} else
 			@throw [OFInvalidArgumentException
 			    exceptionWithClass: [self class]
 				      selector: _cmd];
 
-		[pool release];
+		objc_autoreleasePoolPop(pool);
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}
 
@@ -1209,11 +1209,11 @@
 	}
 }
 
 - (OFXMLElement*)XMLElementBySerializing
 {
-	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
+	void *pool = objc_autoreleasePoolPush();
 	OFXMLElement *element;
 
 	element = [OFXMLElement elementWithName: [self className]
 				      namespace: OF_SERIALIZATION_NS
 				    stringValue: [self description]];
@@ -1284,14 +1284,14 @@
 		@throw [OFInvalidFormatException
 		    exceptionWithClass: [self class]];
 	}
 
 	[element retain];
-	[pool release];
-	[element autorelease];
+
+	objc_autoreleasePoolPop(pool);
 
-	return element;
+	return [element autorelease];
 }
 
 - (OFString*)JSONRepresentation
 {
 	if (type == OF_NUMBER_BOOL)