diff --git a/configs/default b/configs/default
index e39611b..ae2d739 100644
--- a/configs/default
+++ b/configs/default
@@ -78,8 +78,8 @@ APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(G
 
 
 # Installation directories (for make install)
-INSTALL_DIR = /opt/X11R7
-DRI_DRIVER_INSTALL_DIR = /opt/X11R7/lib/dri
+INSTALL_DIR = /usr/local/xorg/
+DRI_DRIVER_INSTALL_DIR = /usr/local/xorg/lib/dri
 
 # Where libGL will look for DRI hardware drivers
 DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)
diff --git a/src/mesa/drivers/dri/i965/brw_vs_tnl.c b/src/mesa/drivers/dri/i965/brw_vs_tnl.c
index 0d61092..b26a192 100644
--- a/src/mesa/drivers/dri/i965/brw_vs_tnl.c
+++ b/src/mesa/drivers/dri/i965/brw_vs_tnl.c
@@ -987,8 +987,14 @@ static void build_lighting( struct tnl_p
 	     * Attenuation never applies to infinite lights.
 	     */
 	    VPpli = register_param3(p, STATE_LIGHT, i, 
-				    STATE_POSITION_NORMALIZED); 
-	    half = register_param3(p, STATE_LIGHT, i, STATE_HALF);
+				    STATE_POSITION_NORMALIZED);
+            if (p->state->light_local_viewer) {
+                struct ureg eye_hat = get_eye_position_normalized(p);
+                half = get_temp(p);
+                emit_op2(p, OPCODE_SUB, half, 0, VPpli, eye_hat);
+                emit_normalize_vec3(p, half, half);
+            } else
+                half = register_param3(p, STATE_LIGHT, i, STATE_HALF);
 	 } 
 	 else {
 	    struct ureg Ppli = register_param3(p, STATE_LIGHT, i,