diff --git a/CHANGES b/CHANGES
index 8ac46c32f0..b4231711de 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1677.	[bug]		dig: +aaonly didn't work, +aaflag undocumented.
+
 1676.	[placeholder]	rt10864
 
 1675.   [placeholder] 	rt10847
diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index 224d8dfc7d..4b02897f41 100644
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.c,v 1.193 2004/06/19 02:23:32 sra Exp $ */
+/* $Id: dig.c,v 1.194 2004/06/23 04:07:29 marka Exp $ */
 
 #include <config.h>
 #include <stdlib.h>
@@ -188,7 +188,7 @@ help(void) {
 "\n"
 "                 +[no]fail           (Don't try next server on SERVFAIL)\n"
 "                 +[no]besteffort     (Try to parse even illegal messages)\n"
-"                 +[no]aaonly         (Set AA flag in query)\n"
+"                 +[no]aaonly         (Set AA flag in query (+[no]aaflag))\n"
 "                 +[no]adflag         (Set AD flag in query)\n"
 "                 +[no]cdflag         (Set CD flag in query)\n"
 "                 +[no]cl             (Control display of class in records)\n"
@@ -738,8 +738,8 @@ plus_option(char *option, isc_boolean_t is_batchfile,
 	switch (cmd[0]) {
 	case 'a':
 		switch (cmd[1]) {
-		case 'a': /* aaflag */
-			FULLCHECK("aaflag");
+		case 'a': /* aaonly / aaflag */
+			FULLCHECK2("aaonly", "aaflag");
 			lookup->aaonly = state;
 			break;
 		case 'd': 
diff --git a/bin/dig/dig.docbook b/bin/dig/dig.docbook
index 7724593785..50b6e5e779 100644
--- a/bin/dig/dig.docbook
+++ b/bin/dig/dig.docbook
@@ -16,7 +16,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: dig.docbook,v 1.19 2004/04/13 02:39:34 marka Exp $ -->
+<!-- $Id: dig.docbook,v 1.20 2004/06/23 04:07:29 marka Exp $ -->
 
 <refentry>
 
@@ -306,9 +306,12 @@ Deprecated, treated as a synonym for <parameter>+[no]search</parameter>
 
 <varlistentry><term><option>+[no]aaonly</option></term>
 <listitem><para>
-This option does nothing.  It is provided for compatibility with old
-versions of <command>dig</command> where it set an unimplemented
-resolver flag.
+Sets the "aa" flag in the query.
+</para></listitem></varlistentry>
+
+<varlistentry><term><option>+[no]aaflag</option></term>
+<listitem><para>
+A synonym for <parameter>+[no]aaonly</parameter>.
 </para></listitem></varlistentry>
 
 <varlistentry><term><option>+[no]adflag</option></term>