@@ -29,11 +29,11 @@
 #include <idna.h>
 
 #import <ObjOpenSSL/SSLSocket.h>
 
 #import "XMPPConnection.h"
-#import "XMPPSRVEnumerator.h"
+#import "XMPPSRVLookup.h"
 #import "XMPPSCRAMAuth.h"
 #import "XMPPPLAINAuth.h"
 #import "XMPPStanza.h"
 #import "XMPPJID.h"
 #import "XMPPIQ.h"
@@ -195,17 +195,15 @@
 }
 
 - (void)connect
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
-	XMPPSRVEnumerator *SRVEnumerator =
-	    [XMPPSRVEnumerator enumeratorWithDomain: server];
+	XMPPSRVLookup *SRVLookup = [XMPPSRVLookup lookupWithDomain: server];
+	OFEnumerator *enumerator = [SRVLookup objectEnumerator];
 	XMPPSRVEntry *candidate;
 
-	[SRVEnumerator lookUpEntries];
-
-	while ((candidate = [SRVEnumerator nextObject]) != nil) {
+	while ((candidate = [enumerator nextObject]) != nil) {
 		@try {
 			[sock connectToHost: [candidate target]
 				     onPort: [candidate port]];
 			break;
 		} @catch (OFAddressTranslationFailedException *e) {