@@ -21,22 +21,21 @@
 #import "OFArray.h"
 #import "OFDNSResolver.h"
 #import "OFSandbox.h"
 #import "OFStdIOStream.h"
 
-@interface OFDNS: OFObject <OFApplicationDelegate>
+@interface OFDNS: OFObject <OFApplicationDelegate, OFDNSResolverDelegate>
 @end
 
 OF_APPLICATION_DELEGATE(OFDNS)
 
 @implementation OFDNS
--    (void)DNSResolver: (OFDNSResolver *)resolver
+-	(void)resolver: (OFDNSResolver *)resolver
   didResolveDomainName: (OFString *)domainName
 	 answerRecords: (OFArray *)answerRecords
       authorityRecords: (OFArray *)authorityRecords
      additionalRecords: (OFArray *)additionalRecords
-	       context: (id)context
 	     exception: (id)exception
 {
 	if (exception != nil) {
 		[of_stderr writeFormat: @"Failed to resolve: %@\n", exception];
 		[OFApplication terminateWithStatus: 1];
@@ -97,12 +96,8 @@
 	}
 
 	[resolver asyncResolveHost: [arguments objectAtIndex: 0]
 		       recordClass: recordClass
 			recordType: recordType
-			    target: self
-			  selector: @selector(DNSResolver:didResolveDomainName:
-					answerRecords:authorityRecords:
-					additionalRecords:context:exception:)
-			   context: nil];
+			  delegate: self];
 }
 @end