@@ -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);
 }