diff --git a/bin/dig/dig.1 b/bin/dig/dig.1
index 04c899a0c0..e295865288 100644
--- a/bin/dig/dig.1
+++ b/bin/dig/dig.1
@@ -624,7 +624,9 @@ be used when resolving this query\&.
.PP
\fB+[no]tcp\fR
.RS 4
-Use [do not use] TCP when querying name servers\&. The default behavior is to use UDP unless an
+Use [do not use] TCP when querying name servers\&. The default behavior is to use UDP unless a type
+any
+or
ixfr=N
query is requested, in which case the default is TCP\&. AXFR queries always use TCP\&.
.RE
diff --git a/bin/dig/dig.html b/bin/dig/dig.html
index 69b76bf9bf..d32e52f900 100644
--- a/bin/dig/dig.html
+++ b/bin/dig/dig.html
@@ -827,10 +827,10 @@
Use [do not use] TCP when querying name servers. The
- default behavior is to use UDP unless an
- ixfr=N query is requested, in which
- case the default is TCP. AXFR queries always use
- TCP.
+ default behavior is to use UDP unless a type
+ any or ixfr=N
+ query is requested, in which case the default is TCP.
+ AXFR queries always use TCP.
+timeout=T
diff --git a/bin/dig/host.1 b/bin/dig/host.1
index 8c9cdd90fc..73da6faf9b 100644
--- a/bin/dig/host.1
+++ b/bin/dig/host.1
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2000-2002, 2004, 2005, 2007-2009, 2014-2016 Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2000-2002, 2004, 2005, 2007-2009, 2014-2017 Internet Systems Consortium, Inc. ("ISC")
.\"
.\" This Source Code Form is subject to the terms of the Mozilla Public
.\" License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -39,7 +39,7 @@
host \- DNS lookup utility
.SH "SYNOPSIS"
.HP \w'\fBhost\fR\ 'u
-\fBhost\fR [\fB\-aCdlnrsTwv\fR] [\fB\-c\ \fR\fB\fIclass\fR\fR] [\fB\-N\ \fR\fB\fIndots\fR\fR] [\fB\-R\ \fR\fB\fInumber\fR\fR] [\fB\-t\ \fR\fB\fItype\fR\fR] [\fB\-W\ \fR\fB\fIwait\fR\fR] [\fB\-m\ \fR\fB\fIflag\fR\fR] [\fB\-4\fR] [\fB\-6\fR] [\fB\-v\fR] [\fB\-V\fR] {name} [server]
+\fBhost\fR [\fB\-aCdlnrsTUwv\fR] [\fB\-c\ \fR\fB\fIclass\fR\fR] [\fB\-N\ \fR\fB\fIndots\fR\fR] [\fB\-R\ \fR\fB\fInumber\fR\fR] [\fB\-t\ \fR\fB\fItype\fR\fR] [\fB\-W\ \fR\fB\fIwait\fR\fR] [\fB\-m\ \fR\fB\fIflag\fR\fR] [\fB\-4\fR] [\fB\-6\fR] [\fB\-v\fR] [\fB\-V\fR] {name} [server]
.SH "DESCRIPTION"
.PP
\fBhost\fR
@@ -181,13 +181,14 @@ If a query type of IXFR is chosen the starting serial number can be specified by
\fB\-t \fR\fBIXFR=12345678\fR)\&.
.RE
.PP
-\-T
+\-T, \-U
.RS 4
-TCP: By default,
+TCP/UDP: By default,
\fBhost\fR
uses UDP when making queries\&. The
\fB\-T\fR
-option makes it use a TCP connection when querying the name server\&. TCP will be automatically selected for queries that require it, such as zone transfer (AXFR) requests\&.
+option makes it use a TCP connection when querying the name server\&. TCP will be automatically selected for queries that require it, such as zone transfer (AXFR) requests\&. Type ANY queries default to TCP but can be forced to UDP initially using
+\fB\-U\fR\&.
.RE
.PP
\-m \fIflag\fR
@@ -264,5 +265,5 @@ runs\&.
\fBInternet Systems Consortium, Inc\&.\fR
.SH "COPYRIGHT"
.br
-Copyright \(co 2000-2002, 2004, 2005, 2007-2009, 2014-2016 Internet Systems Consortium, Inc. ("ISC")
+Copyright \(co 2000-2002, 2004, 2005, 2007-2009, 2014-2017 Internet Systems Consortium, Inc. ("ISC")
.br
diff --git a/bin/dig/host.html b/bin/dig/host.html
index a8cfb4ce77..0ec6ca7a9e 100644
--- a/bin/dig/host.html
+++ b/bin/dig/host.html
@@ -1,6 +1,6 @@