diff --git a/docs/envvars.html b/docs/envvars.html
index 38b212fc020..39bd7251dec 100644
--- a/docs/envvars.html
+++ b/docs/envvars.html
@@ -10,14 +10,27 @@
 Mesa supports the following environment variables:
 </p>
 <ul>
-<li>MESA_DEBUG - if defined, error messages are printed to stderr
-<li>MESA_NO_DITHER - disable dithering, overriding glEnable(GL_DITHER)
+<li>MESA_NO_ASM - if set, disables all assembly language optimizations
+<li>MESA_NO_MMX - if set, disables Intel MMX optimizations
+<li>MESA_NO_3DNOW - if set, disables AMD 3DNow! optimizations
+<li>MESA_NO_SSE - if set, disables Intel SSE optimizations
+<li>MESA_DEBUG - if set, error messages are printed to stderr
+<li>MESA_NO_DITHER - if set, disables dithering, overriding glEnable(GL_DITHER)
+</ul>
+
+<p>
+The following environment variables are only applicable to the Xlib/X11
+software driver:
+</p>
+<ul>
 <li>MESA_RGB_VISUAL - specifies the X visual and depth for RGB mode (X only)
 <li>MESA_CI_VISUAL - specifies the X visual and depth for CI mode (X only)
 <li>MESA_BACK_BUFFER - specifies how to implement the back color buffer (X only)
-<li>MESA_PRIVATE_CMAP - force aux/tk libraries to use private colormaps (X only)
 <li>MESA_GAMMA - gamma correction coefficients (X only)
 <li>MESA_XSYNC - enable synchronous X behavior (for X debugging only)
+<li>MESA_GLX_FORCE_CI - if set, force GLX to treak 8bpp visuals as CI visuals
+<li>MESA_GLX_FX - set to either "fullscreen" for full-screen rendering,
+  "window" to render into a window, or "disable" to disable the Glide driver.
 </ul>