diff --git a/command/agent/dns.go b/command/agent/dns.go
index ac23b27286..0768404055 100644
--- a/command/agent/dns.go
+++ b/command/agent/dns.go
@@ -15,7 +15,7 @@ import (
 const (
 	testQuery           = "_test.consul."
 	consulDomain        = "consul."
-	maxServiceResponses = 3 // TODO: Increase, currently a bug upstream in dns package
+	maxServiceResponses = 3 // For UDP only
 )
 
 // DNSServer is used to wrap an Agent and expose various
@@ -137,6 +137,12 @@ func (d *DNSServer) handleQuery(resp dns.ResponseWriter, req *dns.Msg) {
 		return
 	}
 
+	// Switch to TCP if the client is
+	network := "udp"
+	if _, ok := resp.RemoteAddr().(*net.TCPAddr); ok {
+		network = "tcp"
+	}
+
 	// Setup the message response
 	m := new(dns.Msg)
 	m.SetReply(req)
@@ -144,7 +150,7 @@ func (d *DNSServer) handleQuery(resp dns.ResponseWriter, req *dns.Msg) {
 	d.addSOA(d.domain, m)
 
 	// Dispatch the correct handler
-	d.dispatch(req, m)
+	d.dispatch(network, req, m)
 
 	// Write out the complete response
 	if err := resp.WriteMsg(m); err != nil {
@@ -200,7 +206,7 @@ func (d *DNSServer) addSOA(domain string, msg *dns.Msg) {
 }
 
 // dispatch is used to parse a request and invoke the correct handler
-func (d *DNSServer) dispatch(req, resp *dns.Msg) {
+func (d *DNSServer) dispatch(network string, req, resp *dns.Msg) {
 	// By default the query is in the default datacenter
 	datacenter := d.agent.config.Datacenter
 
@@ -221,9 +227,9 @@ PARSE:
 		// Handle lookup with and without tag
 		switch len(labels) {
 		case 2:
-			d.serviceLookup(datacenter, labels[0], "", req, resp)
+			d.serviceLookup(network, datacenter, labels[0], "", req, resp)
 		case 3:
-			d.serviceLookup(datacenter, labels[1], labels[0], req, resp)
+			d.serviceLookup(network, datacenter, labels[1], labels[0], req, resp)
 		default:
 			goto INVALID
 		}
@@ -232,7 +238,7 @@ PARSE:
 		if len(labels) != 2 {
 			goto INVALID
 		}
-		d.nodeLookup(datacenter, labels[0], req, resp)
+		d.nodeLookup(network, datacenter, labels[0], req, resp)
 
 	default:
 		// Store the DC, and re-parse
@@ -247,7 +253,7 @@ INVALID:
 }
 
 // nodeLookup is used to handle a node query
-func (d *DNSServer) nodeLookup(datacenter, node string, req, resp *dns.Msg) {
+func (d *DNSServer) nodeLookup(network, datacenter, node string, req, resp *dns.Msg) {
 	// Only handle ANY and A type requests
 	qType := req.Question[0].Qtype
 	if qType != dns.TypeANY && qType != dns.TypeA {
@@ -296,7 +302,7 @@ func (d *DNSServer) nodeLookup(datacenter, node string, req, resp *dns.Msg) {
 }
 
 // serviceLookup is used to handle a service query
-func (d *DNSServer) serviceLookup(datacenter, service, tag string, req, resp *dns.Msg) {
+func (d *DNSServer) serviceLookup(network, datacenter, service, tag string, req, resp *dns.Msg) {
 	// Make an RPC request
 	args := structs.ServiceSpecificRequest{
 		Datacenter:  datacenter,
@@ -323,8 +329,8 @@ func (d *DNSServer) serviceLookup(datacenter, service, tag string, req, resp *dn
 	// Perform a random shuffle
 	shuffleServiceNodes(out.Nodes)
 
-	// Restrict the number of responses
-	if len(out.Nodes) > maxServiceResponses {
+	// If the network is not TCP, restrict the number of responses
+	if network != "tcp" && len(out.Nodes) > maxServiceResponses {
 		out.Nodes = out.Nodes[:maxServiceResponses]
 	}