--- channels/chan_iax2.c.orig	2011-01-04 16:53:27.000000000 -0500
+++ channels/chan_iax2.c	2011-02-16 20:58:08.000000000 -0500
@@ -4550,12 +4550,12 @@
 
 		cai->found = 0;
 		sin_tmp.ss.ss_family = AF_INET;
+		sin->sin_port = htons(IAX_DEFAULT_PORTNO);
 		if (ast_get_ip_or_srv(&sin_tmp, peername, srvlookup ? "_iax._udp" : NULL)) {
 			ast_log(LOG_WARNING, "No such host: %s\n", peername);
 			return -1;
 		}
 		ast_sockaddr_to_sin(&sin_tmp, sin);
-		sin->sin_port = htons(IAX_DEFAULT_PORTNO);
 		/* use global iax prefs for unknown peer/user */
 		/* But move the calling channel's native codec to the top of the preference list */
 		memcpy(&ourprefs, &prefs, sizeof(ourprefs));
@@ -12978,7 +12978,7 @@
 
 	maxauthreq = 3;
 
-	srvlookup = 0;
+	srvlookup = 1; /* Servers that advertise SRV records need clients to have srvlookup enabled by default */
 
 	v = ast_variable_browse(cfg, "general");