diff --git a/doc/ChangeLog b/doc/ChangeLog
index cd7895e7..b40cd932 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-20  Hrvoje Niksic  <hniksic@xemacs.org>
+
+	* wget.texi: Document IPv6 related options.
+
 2005-04-18  Hrvoje Niksic  <hniksic@xemacs.org>
 
 	* wget.texi: Update mailing list information.
diff --git a/doc/wget.texi b/doc/wget.texi
index b63b4be3..5e237f6b 100644
--- a/doc/wget.texi
+++ b/doc/wget.texi
@@ -182,6 +182,13 @@ you can get the socks library and build Wget with support for socks.
 Wget uses the passive @sc{ftp} downloading by default, active @sc{ftp}
 being an option.
 
+@sp 1
+@item
+Wget supports IP version 6, the next generation of IP.  IPv6 is
+autodetected at compile-time, and can be disabled at either build or
+run time.  Binaries built with IPv6 support work well in both
+IPv4-only and dual family environments.
+
 @sp 1
 @item
 Built-in features offer mechanisms to tune which links you wish to follow
@@ -189,9 +196,11 @@ Built-in features offer mechanisms to tune which links you wish to follow
 
 @sp 1
 @item
-The retrieval is conveniently traced with printing dots, each dot
-representing a fixed amount of data received (1KB by default).  These
-representations can be customized to your preferences.
+The progress of individual downloads is traced using a progress gauge.
+Interactive downloads are tracked using a ``thermometer''-style gauge,
+whereas non-interactive ones are traced with dots, each dot
+representing a fixed amount of data received (1KB by default).  Either
+gauge can be customized to your preferences.
 
 @sp 1
 @item
@@ -867,6 +876,29 @@ If you append @samp{,nocontrol} to the mode, as in
 switched off.  You can use @samp{--restrict-file-names=nocontrol} to
 turn off escaping of control characters without affecting the choice of
 the OS to use as file name restriction mode.
+
+@cindex IPv6
+@itemx -4
+@itemx --inet4-only
+@itemx -6
+@itemx --inet6-only
+Force connecting to IPv4 or IPv6 addresses.  With @samp{--inet4-only}
+or @samp{-4}, Wget will only connect to IPv4 hosts, ignoring AAAA
+records in DNS, and refusing to connect to IPv6 addresses specified in
+URLs.  Conversely, with @samp{--inet6-only} or @samp{-6}, Wget will
+only connect to IPv6 hosts and ignore A records and IPv4 addresses.
+
+Neither options should be needed normally.  By default, an IPv6-aware
+Wget will use the address family specified by the host's DNS record.
+If the DNS specifies both an A record and an AAAA record, Wget will
+try them in sequence until it finds one it can connect to.
+
+These options can be used to deliberately force the use of IPv4 or
+IPv6 address families on dual family systems, usually to aid debugging
+or to deal with broken network configuration.  Only one of
+@samp{--inet6-only} and @samp{--inet4-only} may be specified in the
+same command.  Neither option is available in Wget compiled without
+IPv6 support.
 @end table
 
 @node Directory Options
@@ -2348,6 +2380,17 @@ Ignore certain @sc{html} tags when doing a recursive retrieval, just like
 Specify a comma-separated list of directories you wish to follow when
 downloading---the same as @samp{-I}.
 
+@item inet4_only = on/off
+Force connecting to IPv4 addresses, off by default.  You can put this
+in the global init file to disable Wget's attempts to resolve and
+connect to IPv6 hosts.  Available only if Wget was compiled with IPv6
+support.  The same as @samp{--inet4-only} or @samp{-4}.
+
+@item inet6_only = on/off
+Force connecting to IPv6 addresses, off by default.  Available only if
+Wget was compiled with IPv6 support.  The same as @samp{--inet6-only}
+or @samp{-6}.
+
 @item input = @var{string}
 Read the @sc{url}s from @var{string}, like @samp{-i}.