diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index ea2aa8ff1..9be18f61b 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -57,3 +57,9 @@ reflect small statics = false
 reflect actors = true
 
 reflect misc = false
+
+[Render]
+
+# Only supported on SM3+ cards
+# If you have a lower end card, this will be disabled automatically
+multiple render targets = true
diff --git a/files/water/GlassFP.cg b/files/water/GlassFP.cg
index eb18885d2..c294f6fff 100644
--- a/files/water/GlassFP.cg
+++ b/files/water/GlassFP.cg
@@ -6,7 +6,7 @@ float4 main_ps(float2 iTexCoord : TEXCOORD0,
        	       float3 noiseCoord : TEXCOORD1,
        	       uniform float4 tintColour) : COLOR
 {
-	float4 normal = tex2D(NormalMap, noiseCoord);
+	float4 normal = tex2D(NormalMap, noiseCoord) * 2 - 1;
 	
 
 	return tex2D(RT, iTexCoord + normal.xy * 0.05) +
diff --git a/files/water/water.material b/files/water/water.material
index abd5ad80e..bca5a9281 100644
--- a/files/water/water.material
+++ b/files/water/water.material
@@ -48,6 +48,7 @@ material Water
 
             vertex_program_ref Water_VP
             {
+                param_named_auto renderTargetFlipping render_target_flipping
             }
             fragment_program_ref Water_FP
             {