diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fde8d068d76..86643d0cff4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2000-11-30  Marek Michalkiewicz  <marekm@linux.org.pl>
+
+	* install.texi (avr): Replace incomplete list of supported MCU
+	types with a link to the current one ...
+	* invoke.texi (AVR Options): ... here.  Update -mmcu= to list
+	all supported MCU types.  Document -minit-stack= default.
+	Document new options -mno-tablejump, -mtiny-stack.
+	* md.texi (AVR family):  Fix typo in 'w' constraint letter
+	description.  Document 'q'.  Update 'O'.
+
 2000-12-01  Bernd Schmidt  <bernds@redhat.co.uk>
 
 	* combine.c (cant_combine_insn_p): Only disallow insns involving
diff --git a/gcc/install.texi b/gcc/install.texi
index 9e768bcdebe..db4f226daff 100644
--- a/gcc/install.texi
+++ b/gcc/install.texi
@@ -992,13 +992,7 @@ AMD Am29050 used in a system running a variant of BSD Unix.
 @item avr
 ATMEL AVR-family micro controllers.  These are used in embedded
 applications.  There are no standard Unix configurations.
-Supports following MCU's:
- - AT90S23xx
- - ATtiny22
- - AT90S44xx
- - AT90S85xx
- - ATmega603/603L
- - ATmega103/103L
+See @xref{AVR Options} for the list of supported MCU types.
 
 @item decstation-*
 MIPS-based DECstations can support three different personalities:
diff --git a/gcc/invoke.texi b/gcc/invoke.texi
index a7316abd56e..b71580cb816 100644
--- a/gcc/invoke.texi
+++ b/gcc/invoke.texi
@@ -474,7 +474,7 @@ in the following sections.
 
 @emph{AVR Options}
 -mmcu=@var{mcu} -msize -minit-stack=@var{n} -mno-interrupts
--mcall-prologues
+-mcall-prologues -mno-tablejump -mtiny-stack
 
 @emph{MCore Options}
 -mhardlit, -mno-hardlit -mdiv -mno-div -mrelax-immediates 
@@ -7312,14 +7312,32 @@ These options are defined for AVR implementations:
 
 @table @code
 @item -mmcu=@var{mcu}
-Specify ATMEL AVR mcu (at90s23xx,attiny22,at90s44xx,at90s85xx,atmega603,
-atmega103).
+Specify ATMEL AVR instruction set or MCU type.
+
+Instruction set avr1 is for the minimal AVR core, not supported by the C
+compiler, only for assembler programs (MCU types: at90s1200, attiny10,
+attiny11, attiny12, attiny15, attiny28).
+
+Instruction set avr2 (default) is for the classic AVR core with up to
+8K program memory space (MCU types: at90s2313, at90s2323, attiny22,
+at90s2333, at90s2343, at90s4414, at90s4433, at90s4434, at90s8515,
+at90c8534, at90s8535).
+
+Instruction set avr3 is for the classic AVR core with up to 128K program
+memory space (MCU types: atmega103, atmega603).
+
+Instruction set avr4 is for the enhanced AVR core with up to 8K program
+memory space (MCU types: atmega83, atmega85).
+
+Instruction set avr5 is for the enhanced AVR core with up to 128K program
+memory space (MCU types: atmega161, atmega163, atmega32, at94k).
 
 @item -msize
-Output instruction size's to the asm file
+Output instruction sizes to the asm file.
 
 @item -minit-stack=@var{N}
-Specify the initial stack address
+Specify the initial stack address, which may be a symbol or numeric value,
+__stack is the default.
 
 @item -mno-interrupts
 Generated code is not compatible with hardware interrupts.
@@ -7328,6 +7346,12 @@ Code size will be smaller.
 @item -mcall-prologues
 Functions prologues/epilogues expanded as call to appropriate
 subroutines. Code size will be smaller.
+
+@item -mno-tablejump
+Do not generate tablejump insns which sometimes increase code size.
+
+@item -mtiny-stack
+Change only the low 8 bits of the stack pointer.
 @end table
 
 @node MCore Options
diff --git a/gcc/md.texi b/gcc/md.texi
index 82271596bb4..6e184f6a810 100644
--- a/gcc/md.texi
+++ b/gcc/md.texi
@@ -1349,7 +1349,7 @@ Registers from r16 to r23
 Registers from r16 to r31
 
 @item w
-Register from r24 to r31. This registers can be used in @samp{addw} command
+Registers from r24 to r31.  These registers can be used in @samp{adiw} command
 
 @item e
 Pointer register (r26 - r31)
@@ -1357,6 +1357,9 @@ Pointer register (r26 - r31)
 @item b
 Base pointer register (r28 - r31)
 
+@item q
+Stack pointer register (SPH:SPL)
+
 @item t
 Temporary register r0
 
@@ -1388,7 +1391,7 @@ Constant that fits in 8 bits
 Constant integer -1
 
 @item O
-Constant integer 8
+Constant integer 8, 16, or 24
 
 @item P
 Constant integer 1