diff --git a/bin/dig/dig.1 b/bin/dig/dig.1
index e4d7fe35d1..efa617d386 100644
--- a/bin/dig/dig.1
+++ b/bin/dig/dig.1
@@ -472,6 +472,12 @@ Keep the TCP socket open between queries and reuse it rather than creating a new
 \fB+nokeepopen\fR\&.
 .RE
 .PP
+\fB+[no]mapped\fR
+.RS 4
+Allow mapped IPv4 over IPv6 addresses to be used\&. The default is
+\fB+mapped\fR\&.
+.RE
+.PP
 \fB+[no]multiline\fR
 .RS 4
 Print records like the SOA records in a verbose multi\-line format with human\-readable comments\&. The default is to print each record on a single line, to facilitate machine parsing of the
diff --git a/bin/dig/dig.html b/bin/dig/dig.html
index d3a422b794..be78e226f8 100644
--- a/bin/dig/dig.html
+++ b/bin/dig/dig.html
@@ -480,6 +480,11 @@
 	      it rather than creating a new TCP socket for each
 	      lookup.  The default is <code class="option">+nokeepopen</code>.
 	    </p></dd>
+<dt><span class="term"><code class="option">+[no]mapped</code></span></dt>
+<dd><p>
+	      Allow mapped IPv4 over IPv6 addresses to be used.  The
+	      default is <code class="option">+mapped</code>.
+	    </p></dd>
 <dt><span class="term"><code class="option">+[no]multiline</code></span></dt>
 <dd><p>
 	      Print records like the SOA records in a verbose
diff --git a/doc/arm/Bv9ARM.ch09.html b/doc/arm/Bv9ARM.ch09.html
index f0f14af7de..4a49320795 100644
--- a/doc/arm/Bv9ARM.ch09.html
+++ b/doc/arm/Bv9ARM.ch09.html
@@ -366,6 +366,10 @@
 	  can now be used to set the DSCP code point in outgoing query
 	  packets.
 	</p></li>
+<li class="listitem"><p>
+	  <span class="command"><strong>dig +mapped</strong></span> can now be used to determine
+	  if mapped IPv4 addresses can be used.
+	</p></li>
 <li class="listitem"><p>
 	  <code class="option">serial-update-method</code> can now be set to
 	  <code class="literal">date</code>. On update, the serial number will
diff --git a/doc/arm/man.dig.html b/doc/arm/man.dig.html
index 6137348ce6..0a617a782b 100644
--- a/doc/arm/man.dig.html
+++ b/doc/arm/man.dig.html
@@ -498,6 +498,11 @@
 	      it rather than creating a new TCP socket for each
 	      lookup.  The default is <code class="option">+nokeepopen</code>.
 	    </p></dd>
+<dt><span class="term"><code class="option">+[no]mapped</code></span></dt>
+<dd><p>
+	      Allow mapped IPv4 over IPv6 addresses to be used.  The
+	      default is <code class="option">+mapped</code>.
+	    </p></dd>
 <dt><span class="term"><code class="option">+[no]multiline</code></span></dt>
 <dd><p>
 	      Print records like the SOA records in a verbose
diff --git a/doc/arm/notes.html b/doc/arm/notes.html
index 1ba4e42b4d..07e5a0bd39 100644
--- a/doc/arm/notes.html
+++ b/doc/arm/notes.html
@@ -327,6 +327,10 @@
 	  can now be used to set the DSCP code point in outgoing query
 	  packets.
 	</p></li>
+<li class="listitem"><p>
+	  <span class="command"><strong>dig +mapped</strong></span> can now be used to determine
+	  if mapped IPv4 addresses can be used.
+	</p></li>
 <li class="listitem"><p>
 	  <code class="option">serial-update-method</code> can now be set to
 	  <code class="literal">date</code>. On update, the serial number will