--- asterisk-orig/channels/chan_sip.c	2010-07-19 17:10:03.000000000 +0200
+++ asterisk/channels/chan_sip.c	2010-07-19 19:36:30.000000000 +0200
@@ -3003,6 +3003,20 @@
 	return "UNKNOWN";
 }
 
+/*! \brief Return service as string */
+static inline const char *get_srv_service(enum sip_transport t)
+{
+	switch (t) {
+	case SIP_TRANSPORT_UDP:
+	case SIP_TRANSPORT_TCP:
+		return "sip";
+	case SIP_TRANSPORT_TLS:
+		return "sips";
+	}
+
+	return "UNKNOWN";
+}
+
 /*! \brief Return transport of dialog.
 	\note this is based on a false assumption. We don't always use the
 	outbound proxy for all requests in a dialog. It depends on the
@@ -4971,7 +4985,12 @@
 		 * an A record lookup should be used instead of SRV.
 		 */
 		if (!hostport.port && sip_cfg.srvlookup) {
-			snprintf(service, sizeof(service), "_sip._%s.%s", get_transport(dialog->socket.type), peername);
+			/* snprintf(service, sizeof(service), "_sip._%s.%s", get_transport(dialog->socket.type), peername); */
+ 			snprintf(service, sizeof(service), "_%s._%s.%s", 
+ 				 get_srv_service(dialog->socket.type),
+ 				 (dialog->socket.type == SIP_TRANSPORT_UDP) ? "UDP" : "TCP",
+ 				 peername
+ 			);
 			if ((srv_ret = ast_get_srv(NULL, host, sizeof(host), &tportno,
 						   service)) > 0) {
 				hostn = host;
@@ -11207,7 +11226,11 @@
 	/* If we have no DNS manager let's do a lookup */
 	if (!mwi->dnsmgr) {
 		char transport[MAXHOSTNAMELEN];
-		snprintf(transport, sizeof(transport), "_sip._%s", get_transport(mwi->transport));
+		/* snprintf(transport, sizeof(transport), "_sip._%s", get_transport(mwi->transport)); */
+ 		snprintf(transport, sizeof(transport), "_%s._%s", 
+ 			 get_srv_service(mwi->transport),
+ 			 get_transport(mwi->transport)
+ 		);
 
 		mwi->us.ss.ss_family = get_address_family_filter(&bindaddr); /* Filter address family */
 		ast_dnsmgr_lookup(mwi->hostname, &mwi->us, &mwi->dnsmgr, sip_cfg.srvlookup ? transport : NULL);
@@ -11941,7 +11964,12 @@
 	if (r->dnsmgr == NULL) {
 		char transport[MAXHOSTNAMELEN];
 		peer = find_peer(r->hostname, NULL, TRUE, FINDPEERS, FALSE, 0);
-		snprintf(transport, sizeof(transport), "_sip._%s", get_transport(r->transport)); /* have to use static get_transport function */
+		/* snprintf(transport, sizeof(transport), "_sip._%s", get_transport(r->transport)); */
+ 		snprintf(transport, sizeof(transport), "_%s._%s", 
+ 			 get_srv_service(r->transport),
+ 			 get_transport(r->transport)
+ 		); /* have to use static get_transport function */
+ 		
 		r->us.ss.ss_family = get_address_family_filter(&bindaddr); /* Filter address family */
 		ast_dnsmgr_lookup(peer ? peer->tohost : r->hostname, &r->us, &r->dnsmgr, sip_cfg.srvlookup ? transport : NULL);
 		if (peer) {
@@ -26042,7 +26070,10 @@
 			*params++ = '\0';
 		}
 
-		snprintf(transport, sizeof(transport), "_sip._%s", get_transport(peer->socket.type));
+		snprintf(transport, sizeof(transport), "_%s._%s", 
+			get_srv_service(peer->socket.type),
+			get_transport(peer->socket.type)
+		);
 
 		peer->addr.ss.ss_family = get_address_family_filter(&bindaddr); /* Filter address family */
 		if (ast_dnsmgr_lookup(_srvlookup, &peer->addr, &peer->dnsmgr, sip_cfg.srvlookup && !peer->portinuri ? transport : NULL)) {