Index: ObjXMPP.oc
==================================================================
--- ObjXMPP.oc
+++ ObjXMPP.oc
@@ -1,3 +1,3 @@
-package_description 1
+package_format 1
 package_depends_on ObjOpenSSL
 LIBS="-lobjxmpp $LIBS"

Index: src/XMPPConnection.m
==================================================================
--- src/XMPPConnection.m
+++ src/XMPPConnection.m
@@ -295,13 +295,11 @@
 			       port: record.port];
 }
 
 -	(void)resolver: (OFDNSResolver *)resolver
   didResolveDomainName: (OFString *)domainName
-	 answerRecords: (OFDictionary *)answerRecords
-      authorityRecords: (OFDictionary *)authorityRecords
-     additionalRecords: (OFDictionary *)additionalRecords
+	      response: (OFDNSResponse *)response
 	     exception: (id)exception
 {
 	OFMutableArray *records = [OFMutableArray array];
 
 	if (exception != nil) {
@@ -311,11 +309,11 @@
 			   withObject: exception];
 		return;
 	}
 
 	for (OFDNSResourceRecord *record in
-	    [answerRecords objectForKey: domainName])
+	    [response.answerRecords objectForKey: domainName])
 		if ([record isKindOfClass: [OFSRVDNSResourceRecord class]])
 		       [records addObject: record];
 
 	/* TODO: Sort records */
 	[records makeImmutable];
@@ -347,15 +345,16 @@
 		[_socket asyncConnectToHost: _server
 				       port: _port];
 	else {
 		OFString *SRVDomain = [_domainToASCII
 		    stringByPrependingString: @"_xmpp-client._tcp."];
-		[[OFThread DNSResolver]
-		    asyncResolveHost: SRVDomain
+		OFDNSRequest *request = [OFDNSRequest
+		    requestWithHost: SRVDomain
 			 recordClass: OF_DNS_RESOURCE_RECORD_CLASS_IN
-			  recordType: OF_DNS_RESOURCE_RECORD_TYPE_SRV
-			    delegate: self];
+			  recordType: OF_DNS_RESOURCE_RECORD_TYPE_SRV];
+		[[OFThread DNSResolver] asyncPerformRequest: request
+						   delegate: self];
 	}
 
 	objc_autoreleasePoolPop(pool);
 }
 

Index: src/XMPPFileStorage.m
==================================================================
--- src/XMPPFileStorage.m
+++ src/XMPPFileStorage.m
@@ -27,11 +27,10 @@
 #import <ObjFW/OFString.h>
 #import <ObjFW/OFArray.h>
 #import <ObjFW/OFDictionary.h>
 #import <ObjFW/OFNumber.h>
 #import <ObjFW/OFData.h>
-#import <ObjFW/OFAutoreleasePool.h>
 
 #import <ObjFW/OFNotImplementedException.h>
 
 #import "XMPPFileStorage.h"
 
@@ -44,21 +43,21 @@
 - (instancetype)initWithFile: (OFString *)file
 {
 	self = [super init];
 
 	@try {
-		OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
+		void *pool = objc_autoreleasePoolPush();
 
 		_file = [file copy];
 		@try {
 			_data = [[OFData dataWithContentsOfFile: file]
 			    .messagePackValue copy];
 		} @catch (id e) {
 			_data = [[OFMutableDictionary alloc] init];
 		}
 
-		[pool release];
+		objc_autoreleasePoolPop(pool);
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}
 

Index: src/XMPPSCRAMAuth.m
==================================================================
--- src/XMPPSCRAMAuth.m
+++ src/XMPPSCRAMAuth.m
@@ -206,20 +206,20 @@
 	return ret;
 }
 
 - (OFData *)continueWithData: (OFData *)data
 {
-	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
+	void *pool = objc_autoreleasePoolPush();
 	OFData *ret;
 
 	if (!_serverSignature)
 		ret = [self xmpp_parseServerFirstMessage: data];
 	else
 		ret = [self xmpp_parseServerFinalMessage: data];
 
 	[ret retain];
-	[pool release];
+	objc_autoreleasePoolPop(pool);
 
 	return [ret autorelease];
 }
 
 - (OFData *)xmpp_parseServerFirstMessage: (OFData *)data