diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index 68c07c1ab..9679533be 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -112,7 +112,7 @@ class ClipCullNode : public osg::Group
             }
 
             // move the plane back along its normal a little bit to prevent bleeding at the water shore
-            const float clipFudge = -5;
+            const float clipFudge = -6;
             modelViewMatrix->preMultTranslate(mCullPlane->getNormal() * clipFudge);
 
             cv->pushModelViewMatrix(modelViewMatrix, osg::Transform::RELATIVE_RF);
diff --git a/files/shaders/water_fragment.glsl b/files/shaders/water_fragment.glsl
index 867a24a70..bb56e95c6 100644
--- a/files/shaders/water_fragment.glsl
+++ b/files/shaders/water_fragment.glsl
@@ -76,7 +76,7 @@ uniform float near;
 uniform float far;
 uniform vec3 nodePosition;
 
-float transformDepth(float depth)  // helper for transforming refraction depth
+float transformDepth(float depth)  // helper for transforming water depth
   {
     float z_n = 2.0 * depth - 1.0;
     depth = 2.0 * near * far / (far + near - z_n * (far - near));
@@ -156,27 +156,30 @@ void main(void)
 
     fresnel = clamp(fresnel, 0.0, 1.0);
 
+#if REFRACTION
     float realWaterDepth = transformDepth(texture2D(refractionDepthMap, screenCoords).x);
-
     float shore = clamp(realWaterDepth / REFLECTION_BUMP_SUPPRESS_DEPTH,0,1);
+#else
+    float shore = 1.0;
+#endif
 
     // reflection
     vec3 reflection = texture2D(reflectionMap, screenCoords+(normal.xy*REFL_BUMP*shore)).rgb;
 
     // refraction
 #if REFRACTION
-    vec3 refraction = texture2D(refractionMap,  screenCoords-(normal.xy*REFR_BUMP)).rgb;
+    vec3 refraction = texture2D(refractionMap, screenCoords-(normal.xy*REFR_BUMP*shore)).rgb;
 
     // brighten up the refraction underwater
     refraction = (cameraPos.z < 0.0) ? clamp(refraction * 1.5, 0.0, 1.0) : refraction;
 #endif
-
     // specular
     vec3 R = reflect(vVec, normal);
     float specular = pow(max(dot(R, lVec), 0.0),SPEC_HARDNESS) * shadow;
 
     vec3 waterColor = WATER_COLOR;
     waterColor = waterColor * length(gl_LightModel.ambient.xyz);
+
 #if REFRACTION
     float refractionDepth = transformDepth(texture2D(refractionDepthMap, screenCoords-(normal.xy*REFR_BUMP)).x); 
     float waterDepth = refractionDepth - depthPassthrough;