diff --git a/docs/ispc.rst b/docs/ispc.rst
index 2caf9c4c..ddac4bcd 100644
--- a/docs/ispc.rst
+++ b/docs/ispc.rst
@@ -1142,7 +1142,7 @@ in C:
 
 * Expression syntax and basic types
 * Syntax for variable declarations
-* Control flow structures: if, for, while, do
+* Control flow structures: ``if``, ``for``, ``while``, ``do``, and ``switch``.
 * Pointers, including function pointers, ``void *``, and C's array/pointer
   duality (arrays are converted to pointers when passed to functions, etc.)
 * Structs and arrays
@@ -1186,7 +1186,6 @@ but are likely to be supported in future releases:
   ``int64`` types
 * Character constants
 * String constants and arrays of characters as strings
-* ``switch`` statements
 * ``goto`` statements are partially supported (see `Unstructured Control Flow: "goto"`_)
 * ``union`` types
 * Bitfield members of ``struct`` types
diff --git a/stmt.cpp b/stmt.cpp
index ae28ac67..acc36aaa 100644
--- a/stmt.cpp
+++ b/stmt.cpp
@@ -2156,7 +2156,7 @@ SwitchStmt::TypeCheck() {
     // within a switch with a "uniform" condition, we promote the condition
     // to varying so that everything works out and we are set to handle the
     // resulting divergent control flow.  This is somewhat sub-optimal; see
-    // Issue #XXX for details.
+    // https://github.com/ispc/ispc/issues/156 for details.
     bool isUniform = (exprType->IsUniformType() && 
                       lHasVaryingBreakOrContinue(stmts) == false);