diff --git a/src/mesa/swrast_setup/ss_vb.c b/src/mesa/swrast_setup/ss_vb.c
index 6849c0c0802..5e0f4dc84b3 100644
--- a/src/mesa/swrast_setup/ss_vb.c
+++ b/src/mesa/swrast_setup/ss_vb.c
@@ -168,6 +168,9 @@ _swsetup_choose_rastersetup_func(GLcontext *ctx)
 
          if (ctx->Point._Attenuated)
             funcindex |= EYE;
+
+	 if (ctx->Fog.Enabled)
+	    funcindex |= FOG;
       }
       else {
          funcindex = INDEX;