Index: doc/LaTeXmacros/lstlang.sty
===================================================================
--- doc/LaTeXmacros/lstlang.sty	(revision 515989c7675bdc58b930d5189980f3bacf8a141e)
+++ doc/LaTeXmacros/lstlang.sty	(revision 2ad507b885368719fd59cefe0035ff6aef51943d)
@@ -8,6 +8,6 @@
 %% Created On       : Sat May 13 16:34:42 2017
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Mon Jul 24 20:40:37 2017
-%% Update Count     : 13
+%% Last Modified On : Wed Aug 30 22:11:14 2017
+%% Update Count     : 14
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -112,5 +112,5 @@
 		finally, forall, ftype, _Generic, _Imaginary, inline, __label__, lvalue, _Noreturn, one_t, 
 		otype, restrict, _Static_assert, throw, throwResume, trait, try, ttype, typeof, __typeof, 
-		__typeof__, virtual, with, zero_t},
+		__typeof__, virtual, waitfor, when, with, zero_t},
 	morekeywords=[2]{
 		_Atomic, coroutine, is_coroutine, is_monitor, is_thread, monitor, mutex, nomutex, 
Index: doc/refrat/keywords.tex
===================================================================
--- doc/refrat/keywords.tex	(revision 515989c7675bdc58b930d5189980f3bacf8a141e)
+++ doc/refrat/keywords.tex	(revision 2ad507b885368719fd59cefe0035ff6aef51943d)
@@ -11,6 +11,6 @@
 %% Created On       : Sun Aug  6 08:17:27 2017
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Sun Aug  6 08:31:42 2017
-%% Update Count     : 4
+%% Last Modified On : Wed Aug 30 22:10:10 2017
+%% Update Count     : 5
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \begin{tabular}{@{}llllll@{}}
@@ -52,11 +52,11 @@
 ©ttype©			\\
 ©virtual©		\\
-©with©			\\
+©waitfor©		\\
 \end{tabular}
 &
 \begin{tabular}{@{}l@{}}
+©when©			\\
+©with©			\\
 ©zero_t©		\\
-				\\
-				\\
 				\\
 				\\