diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index 6085f236ba..18cb90c9e2 100644
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jul 12 11:10:05 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* gdb.texinfo:  Document `set assembly-language'.
+
 Thu Jul 11 13:50:28 1996  Stan Shebs  <shebs@andros.cygnus.com>
 
 	* remote.texi: Update list of stubs in the GDB distribution.
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 9ccef79229..60d9c77aa3 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -3929,6 +3929,22 @@ to 0x808c:
 @end smallexample
 @end ifset
 
+@table @code
+@kindex set assembly-language
+@cindex assembly instructions
+@cindex instructions, assembly
+@cindex machine instructions
+@cindex listing machine instructions
+@item set assembly-language @var{instruction-set}
+This command selects the instruction set to use when disassembling the program via the
+@code{disassemble} or @code{x/i} commands.  It is useful for architectures that
+have more than one native instruction set.
+
+Currently it is only defined for the Intel x86 family.  You can set @var{instruction-set}
+to either @code{i386} or @code{i8086}.  The default is @code{i386}.
+@end table
+
+
 @node Data
 @chapter Examining Data