diff --git a/doc/funcref.sgml b/doc/funcref.sgml
index 1d5ee7c19..e634a4f6f 100644
--- a/doc/funcref.sgml
+++ b/doc/funcref.sgml
@@ -4,7 +4,7 @@
 <title>cc65 function reference
 <author><url url="mailto:uz@cc65.org" name="Ullrich von Bassewitz">,<newline>
 <url url="mailto:greg.king5@verizon.net" name="Greg King">
-<date>2017-09-02
+<date>2017-11-21
 
 <abstract>
 cc65 is a C compiler for 6502 based systems. This function reference describes
@@ -352,10 +352,10 @@ function.
 
 <sect1><tt/gamate.h/<label id="gamate.h"><p>
 
-<!-- <itemize> -->
+<itemize>
 <!-- <item><ref id="get_tv" name="get_tv"> -->
-<!-- <item><ref id="waitvblank" name="waitvblank"> -->
-<!-- </itemize> -->
+<item><ref id="waitvsync" name="waitvsync">
+</itemize>
 
 (incomplete)
 
@@ -437,10 +437,10 @@ function.
 
 <sect1><tt/nes.h/<label id="nes.h"><p>
 
-<!-- <itemize> -->
+<itemize>
 <!-- <item><ref id="get_tv" name="get_tv"> -->
-<!-- <item><ref id="waitvsync" name="waitvsync"> -->
-<!-- </itemize> -->
+<item><ref id="waitvsync" name="waitvsync">
+</itemize>
 
 (incomplete)
 
@@ -455,10 +455,10 @@ It does not declare any functions.
 
 <sect1><tt/pce.h/<label id="pce.h"><p>
 
-<!-- <itemize> -->
+<itemize>
 <!-- <item><ref id="get_tv" name="get_tv"> -->
-<!-- <item><ref id="waitvblank" name="waitvblank"> -->
-<!-- </itemize> -->
+<item><ref id="waitvsync" name="waitvsync">
+</itemize>
 
 (incomplete)
 
@@ -7612,6 +7612,23 @@ used in presence of a prototype.
 </quote>
 
 
+<sect1>waitvsync<label id="waitvsync"><p>
+
+<quote>
+<descrip>
+<tag/Function/Wait until the start of the next frame.
+<tag/Header/
+<tt/<ref id="gamate.h" name="gamate.h">/,
+<tt/<ref id="nes.h" name="nes.h">/,
+<tt/<ref id="pce.h" name="pce.h">/
+<tag/Declaration/<tt/void waitvsync (void);/
+<tag/Description/Wait for vertical sync to reduce flickering.
+<tag/Availability/Platforms above
+<tag/Example/None.
+</descrip>
+</quote>
+
+
 <sect1>wherex<label id="wherex"><p>
 
 <quote>
diff --git a/doc/gamate.sgml b/doc/gamate.sgml
index 14b1a27e9..0948c20c4 100644
--- a/doc/gamate.sgml
+++ b/doc/gamate.sgml
@@ -44,6 +44,13 @@ by an external program. Such an utility is provided in util/gamate/gamate-fixcar
 Programs containing Gamate specific code may use the <tt/gamate.h/ header file.
 
 
+<sect1>Gamate specific functions<p>
+
+<itemize>
+<item>waitvsync</item>
+</itemize>
+
+
 <sect1>Hardware access<p>
 
 The following pseudo variables declared in the <tt/gamate.inc/ include file do
diff --git a/doc/supervision.sgml b/doc/supervision.sgml
index cf2af7967..c2ed425dd 100644
--- a/doc/supervision.sgml
+++ b/doc/supervision.sgml
@@ -63,14 +63,6 @@ Special locations:
 Programs containing Supervision specific code may use the <tt/supervision.h/ header file.
 
 
-<sect1>Supervision specific functions<p>
-
-<itemize>
-<item>waitvsync</item>
-</itemize>
-
-
-
 <sect1>Hardware access<p>
 
 The following pseudo variables declared in the <tt/supervision.inc/ include file do
@@ -102,11 +94,12 @@ No extended memory drivers are currently available for the Supervision.
 
 <sect1>Joystick drivers<p>
 
-No joystick drivers are currently available for the Supervision.
-<!--A joystick driver for the standard buttons is available, but must be
-statically linked, because no file I/O is available. See the documentation for
-the <url url="co65.html" name="co65 utility"> for information on how to do
-that.-->
+<descrip>
+
+  <tag><tt/supervision-stdjoy.joy (supervision_stdjoy_joy)/</tag>
+  A joystick driver for the standard two buttons joypad is available.
+
+</descrip><p>
 
 <sect1>Mouse drivers<p>