diff --git a/doc/cc65.sgml b/doc/cc65.sgml
index ba44c43af..c565fd59c 100644
--- a/doc/cc65.sgml
+++ b/doc/cc65.sgml
@@ -70,6 +70,7 @@ Short options:
   -h                    Help (this text)
   -j                    Default characters are signed
   -o name               Name the output file
+  -r                    Enable register variables
   -t sys                Set the target system
   -v                    Increase verbosity
 
@@ -87,6 +88,8 @@ Long options:
   --debug-info          Add debug info to object file
   --help                Help (this text)
   --include-dir dir     Set an include directory search path
+  --register-space b    Set space available for register variables
+  --register-vars       Enable register variables
   --rodata-name seg     Set the name of the RODATA segment
   --signed-chars        Default characters are signed
   --static-locals       Make local variables static
@@ -177,6 +180,38 @@ Here is a description of all the command line options:
   Print the short option summary shown above.
 
 
+  <tag><tt>-o name</tt></tag>
+
+  Specify the name of the output file. If you don't specify a name, the
+  name of the C input file is used, with the extension replaced by ".s".
+
+
+  <tag><tt>-r, --register-vars</tt></tag>
+
+  <tt/-r/ will make the compiler honor the <tt/register/ keyword. Local
+  variables may be placed in registers (which are actually zero page
+  locations). There is some overhead involved with register variables, since
+  the old contents of the registers must be saved and restored. Since register
+  variables are of limited use without the optimizer, there is also a combined
+  switch: <tt/-Or/ will enable both, the optmizer and register variables.
+
+  For more information about register variables see <ref id="regvars"
+  name="register variables">.
+
+
+  <tag><tt>--register-space</tt></tag>
+
+  This option takes a numeric parameter and is used to specify, how much
+  zero page register space is available. Please note that just giving this
+  option will not increase or decrease by itself, it will just tell the
+  compiler about the available space. You will have to allocate that space
+  yourself using an assembler module with the necessary allocations, and a
+  linker configuration that matches the assembler module. The default value
+  for this option is 6 (bytes).
+
+  If you don't know what all this means, please don't use this option.
+
+
   <tag><tt>--rodata-name seg</tt></tag>
 
   Set the name of the rodata segment (the segment used for readonly data).
@@ -262,12 +297,6 @@ Here is a description of all the command line options:
   search list.
 
 
-  <tag><tt>-o name</tt></tag>
-
-  Specify the name of the output file. If you don't specify a name, the
-  name of the C input file is used, with the extension replaced by ".s".
-
-
   <tag><tt>-O, -Oi, -Or, -Os</tt></tag>
 
   Enable an optimizer run over the produced code.
@@ -372,12 +401,8 @@ and the one defined by the ISO standard:
       	<p>
 <item>	The compiler does not support bit fields.
       	<p>
-<item>	Because of the "wrong" order of the parameters on the stack, there is
-      	an additional macro needed to access parameters in a variable
-      	parameter list in a C function.
-      	<p>
-<item>	Functions may not return structs (or unions), and structs may not be
-      	passed as parameters by value. However, struct assignment *is*
+<item> 	C Functions may not return structs (or unions), and structs may not
+        be passed as parameters by value. However, struct assignment *is*
       	possible.
       	<p>
 <item>	Part of the C library is available only with fastcall calling
@@ -485,9 +510,9 @@ This cc65 version has some extensions to the ISO C standard.
 
 	<tscreen><verb>
 	_GCmd:
-	 	.byte	3
-		.word	$2000
-		.word	$3000
+	   	.byte	3
+	   	.word	$2000
+	   	.word	$3000
 	</verb></tscreen>
 
 	Since the variable is of type <tt/void/ you may not use it as is.
@@ -514,6 +539,19 @@ The compiler defines several macros at startup:
   compiler in hex. Version 2.0.1 of the compiler will have this macro defined
   as 0x0201.
 
+  <tag><tt>__APPLE2__</tt></tag>
+
+  This macro is defined if the target is the Apple ][ (-t apple2).
+
+  <tag><tt>__ATARI__</tt></tag>
+
+  This macro is defined if the target is one of the Atari computers
+  (400/800/130XL/800XL).
+
+  <tag><tt>__ATMOS__</tt></tag>
+
+  This macro is defined if the target is the Oric Atmos (-t atmos).
+
   <tag><tt>__CBM__</tt></tag>
 
   This macro is defined if the target system is one of the CBM targets.
@@ -547,15 +585,6 @@ The compiler defines several macros at startup:
 
   This macro is defined if the target is the PET family of computers (-t pet).
 
-  <tag><tt>__ATARI__</tt></tag>
-
-  This macro is defined if the target is one of the Atari computers
-  (400/800/130XL/800XL).
-
-  <tag><tt>__APPLE2__</tt></tag>
-
-  This macro is defined if the target is the Apple ][ (-t apple2).
-
   <tag><tt>__GEOS__</tt></tag>
 
   This macro is defined if you are compiling for the GEOS system (-t geos).
@@ -768,6 +797,48 @@ id="pragma-staticlocals"<p>
 
 
 
+<sect>Register variables<label id="regvars"><p>
+
+The runtime for all supported platforms has 6 bytes of zero page space
+available for register variables (this could be increased, but I think it's a
+good value). So you can declare register variables up to a total size of 6 per
+function. The compiler will allocate register space on a "first come, first
+served" base and convert any <tt/register/ declarations that exceed the
+available register space silently to <tt/auto/. Parameters can also be
+declared as <tt/register/, this will in fact give slightly shorter code than
+using a register variable.
+
+Since a function must save the current values of the registers on entry and
+restore them on exit, there is an overhead associated with register variables,
+and this overhead is quite high (about 20 bytes per variable). This means that
+just declaring anything as <tt/register/ is not a good idea.
+
+The best use for register variables are pointers, especially those that point
+to structures. The magic number here is about 3 uses of a struct field: If the
+function contains this number or even more, the generated code will be usually
+shorter and faster when using a register variable for the struct pointer. The
+reason for this is that the register variable can in many cases be used as a
+pointer directly. Having a pointer in an auto variable means that this pointer
+must first be copied into a zero page location, before it can be dereferenced.
+
+Second best use for register variables are counters. However, there is not
+much difference in the code generated for counters, so you will need at least
+100 operations on this variable (for example in a loop) to make it worth the
+trouble. The only savings you get here are by the use of a zero page variable
+instead of one on the stack or in the data segment.
+
+Register variables must be explicitly enabled by using <tt/-Or/ or <tt/-r/ on
+the command line. Register variables are only accepted on function top level,
+register variables declared in interior blocks are silently converted to
+<tt/auto/. With register variables disabled, all variables declared as
+<tt/register/ are actually auto variables.
+
+Please take care when using register variables: While they are helpful and can
+lead to a tremendous speedup when used correctly, improper usage will cause
+bloated code and a slowdown.
+
+
+
 <sect>Inline assembler<label id="inline-asm"><p>
 
 The compiler allows to insert assembler statements into the output file. The
diff --git a/doc/cl65.sgml b/doc/cl65.sgml
index c521b2d37..e98b10bd7 100644
--- a/doc/cl65.sgml
+++ b/doc/cl65.sgml
@@ -41,6 +41,7 @@ Short options:
   -l                    Create an assembler listing
   -m name               Create a map file
   -o name               Name the output file
+  -r                    Enable register variables
   -t sys                Set the target system
   -v                    Verbose mode
   -vm                   Verbose map file
@@ -77,6 +78,8 @@ Long options:
   --include-dir dir     Set a compiler include directory path
   --listing             Create an assembler listing
   --mapfile name        Create a map file
+  --register-space b    Set space available for register variables
+  --register-vars       Enable register variables
   --rodata-name seg     Set the name of the RODATA segment
   --signed-chars        Default characters are signed
   --start-addr addr     Set the default start address
diff --git a/doc/coding.sgml b/doc/coding.sgml
index 23f04ee7e..19c7074f0 100644
--- a/doc/coding.sgml
+++ b/doc/coding.sgml
@@ -312,6 +312,10 @@ As a general rule: Use register variables only for pointers that are
 dereferenced several times in your function, or for heavily used induction
 variables in a loop (with several 100 accesses).
 
+When declaring register variables, try to keep them together, because this
+will allow the compiler to save and restore the old values in one chunk, and
+not in several.
+
 And remember: Register variables must be enabled with <tt/-r/ or <tt/-Or/.