diff --git a/interface/resources/shaders/shadow_map.frag b/interface/resources/shaders/shadow_map.frag
index 4bd8b8b768..810fc6a947 100644
--- a/interface/resources/shaders/shadow_map.frag
+++ b/interface/resources/shaders/shadow_map.frag
@@ -10,7 +10,8 @@
 
 uniform sampler2DShadow shadowMap;
 
+varying vec4 shadowColor;
+
 void main(void) {
-    gl_FragColor = gl_Color * mix(vec4(0.8, 0.8, 0.8, 1.0), vec4(1.0, 1.0, 1.0, 1.0),
-        shadow2D(shadowMap, gl_TexCoord[0].stp));
+    gl_FragColor = gl_Color * mix(shadowColor, vec4(1.0, 1.0, 1.0, 1.0), shadow2D(shadowMap, gl_TexCoord[0].stp));
 }
diff --git a/interface/resources/shaders/shadow_map.vert b/interface/resources/shaders/shadow_map.vert
new file mode 100644
index 0000000000..a15cd070b9
--- /dev/null
+++ b/interface/resources/shaders/shadow_map.vert
@@ -0,0 +1,30 @@
+#version 120
+
+//
+//  shadow_map.vert
+//  vertex shader
+//
+//  Created by Andrzej Kapolka on 3/27/14.
+//  Copyright (c) 2014 High Fidelity, Inc. All rights reserved.
+//
+
+varying vec4 shadowColor;
+
+void main(void) {
+    // the shadow color depends on the light product
+    vec4 normal = normalize(gl_ModelViewMatrix * vec4(gl_Normal, 0.0));
+    float lightProduct = dot(normal, gl_LightSource[0].position);
+    shadowColor = mix(vec4(1.0, 1.0, 1.0, 1.0), vec4(0.8, 0.8, 0.8, 1.0), step(0.0, lightProduct));
+    
+    // standard diffuse lighting
+    gl_FrontColor = gl_Color * (gl_LightModel.ambient + gl_LightSource[0].ambient +
+        gl_LightSource[0].diffuse * max(0.0, lightProduct));
+    
+    // generate the shadow texture coordinate using the eye position
+    vec4 eyePosition = gl_ModelViewMatrix * gl_Vertex;
+    gl_TexCoord[0] = vec4(dot(gl_EyePlaneS[0], eyePosition), dot(gl_EyePlaneT[0], eyePosition),
+        dot(gl_EyePlaneR[0], eyePosition), 1.0); 
+    
+    // use the fixed function transform
+    gl_Position = ftransform();
+}
diff --git a/interface/src/voxels/VoxelSystem.cpp b/interface/src/voxels/VoxelSystem.cpp
index 4db5af3c04..5c68485436 100644
--- a/interface/src/voxels/VoxelSystem.cpp
+++ b/interface/src/voxels/VoxelSystem.cpp
@@ -506,8 +506,10 @@ void VoxelSystem::initVoxelMemory() {
             _perlinModulateProgram.setUniformValue("permutationNormalTexture", 0);
             _perlinModulateProgram.release();
 
-            _shadowMapProgram.addShaderFromSourceFile(QGLShader::Fragment, Application::resourcesPath()
-                                                      + "shaders/shadow_map.frag");
+            _shadowMapProgram.addShaderFromSourceFile(QGLShader::Vertex,
+                Application::resourcesPath() + "shaders/shadow_map.vert");
+            _shadowMapProgram.addShaderFromSourceFile(QGLShader::Fragment,
+                Application::resourcesPath() + "shaders/shadow_map.frag");
             _shadowMapProgram.link();
 
             _shadowMapProgram.bind();
@@ -1471,10 +1473,6 @@ void VoxelSystem::applyScaleAndBindProgram(bool texture) {
     if (Menu::getInstance()->isOptionChecked(MenuOption::Shadows)) {
         _shadowMapProgram.bind();
         glBindTexture(GL_TEXTURE_2D, Application::getInstance()->getTextureCache()->getShadowDepthTextureID());
-        glEnable(GL_TEXTURE_GEN_S);
-        glEnable(GL_TEXTURE_GEN_T);
-        glEnable(GL_TEXTURE_GEN_R);
-        glEnable(GL_TEXTURE_2D);
 
         glTexGenfv(GL_S, GL_EYE_PLANE, (const GLfloat*)&Application::getInstance()->getShadowMatrix()[0]);
         glTexGenfv(GL_T, GL_EYE_PLANE, (const GLfloat*)&Application::getInstance()->getShadowMatrix()[1]);
@@ -1496,10 +1494,7 @@ void VoxelSystem::removeScaleAndReleaseProgram(bool texture) {
     if (Menu::getInstance()->isOptionChecked(MenuOption::Shadows)) {
         _shadowMapProgram.release();
         glBindTexture(GL_TEXTURE_2D, 0);
-        glDisable(GL_TEXTURE_GEN_S);
-        glDisable(GL_TEXTURE_GEN_T);
-        glDisable(GL_TEXTURE_GEN_R);
-        glDisable(GL_TEXTURE_2D);
+        
 
     } else if (texture) {
         _perlinModulateProgram.release();