diff --git a/Source/client/defs.h b/Source/client/defs.h
index a8c7f07e..dbd4a9dd 100644
--- a/Source/client/defs.h
+++ b/Source/client/defs.h
@@ -38,6 +38,7 @@ var int autocvar_cl_smoothstairs = TRUE;
 var int autocvar_v_lefthanded = FALSE;
 var string autocvar_cl_logofile = "lambda";
 var vector autocvar_cl_logocolor = '255 0 0';
+var float autocvar_zoom_sensitivity = 1.0f;
 
 // Particle stuff
 var float PARTICLE_SPARK;
diff --git a/Source/client/entry.c b/Source/client/entry.c
index 5216b0c4..d215da89 100644
--- a/Source/client/entry.c
+++ b/Source/client/entry.c
@@ -176,7 +176,13 @@ void CSQC_UpdateView(float w, float h, float focus)
 		}
 
 		setproperty(VF_AFOV, cvar("fov") * pl.viewzoom);
-		setsensitivityscaler(pl.viewzoom);
+
+		if (autocvar_zoom_sensitivity && pl.viewzoom < 1.0f) {
+			setsensitivityscaler(pl.viewzoom * autocvar_zoom_sensitivity);
+		} else {
+			setsensitivityscaler(pl.viewzoom);
+		}
+
 		pl.viewzoom = oldzoom;
 		
 		View_Stairsmooth();
diff --git a/cstrike/data.pk3dir/csprogs.dat b/cstrike/data.pk3dir/csprogs.dat
index 6de04106..0ff44a2e 100644
Binary files a/cstrike/data.pk3dir/csprogs.dat and b/cstrike/data.pk3dir/csprogs.dat differ
diff --git a/rewolf/data.pk3dir/csprogs.dat b/rewolf/data.pk3dir/csprogs.dat
index 86c06c4c..e82fc8a8 100644
Binary files a/rewolf/data.pk3dir/csprogs.dat and b/rewolf/data.pk3dir/csprogs.dat differ
diff --git a/scihunt/data.pk3dir/csprogs.dat b/scihunt/data.pk3dir/csprogs.dat
index 46dfc52f..9e35a652 100644
Binary files a/scihunt/data.pk3dir/csprogs.dat and b/scihunt/data.pk3dir/csprogs.dat differ
diff --git a/valve/data.pk3dir/csprogs.dat b/valve/data.pk3dir/csprogs.dat
index 1d78ec6d..4d69a87f 100644
Binary files a/valve/data.pk3dir/csprogs.dat and b/valve/data.pk3dir/csprogs.dat differ