diff -ur bind-9.9.3rc2/bin/named/query.c bind-9.9.3rc2-tcp-any/bin/named/query.c
--- bind-9.9.3rc2/bin/named/query.c	2013-04-30 06:38:46.000000000 +0000
+++ bind-9.9.3rc2-tcp-any/bin/named/query.c	2013-05-16 00:38:03.218980040 +0000
@@ -7655,5 +7657,13 @@
 
 	qclient = NULL;
 	ns_client_attach(client, &qclient);
+
+	/* direct all TYPE=255/ANY queries to TCP */
+	if (qtype == dns_rdatatype_any &&
+		(client->attributes & NS_CLIENTATTR_TCP) == 0)
+	{
+		client->message->flags |= DNS_MESSAGEFLAG_TC;
+	}
+
 	(void)query_find(qclient, NULL, qtype);
 }