diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index cfecefa6a..ca5998d9a 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 D1X-Rebirth Changelog
 
+20120608
+--------
+main/kconfig.c: Switching keyboard sensitivity function from variable increase to variable offset, making the ship more responsive in higher settings
+
 20120601
 --------
 main/kconfig.c, main/kconfig.h, main/menu.c, main/playsave.c, main/playsave.h: Introduced sensitivity sliders for keyboard which cause movement increase the longer the designated key is pressed
diff --git a/main/kconfig.c b/main/kconfig.c
index 36ffd36f1..186c45774 100644
--- a/main/kconfig.c
+++ b/main/kconfig.c
@@ -1303,7 +1303,7 @@ void kconfig_read_controls(d_event *event, int automap_flag)
 		if ( Controls.key_pitch_forward_state ) 
 		{
 			if ( Controls.key_pitch_forward_down_time < F1_0 )
-				Controls.key_pitch_forward_down_time += FrameTime*((float)PlayerCfg.KeyboardSens[1]/4);
+				Controls.key_pitch_forward_down_time += (!Controls.key_pitch_forward_down_time)?F1_0*((float)PlayerCfg.KeyboardSens[1]/16)+1:FrameTime/4;
 			Controls.pitch_time += speed_factor*FrameTime/2*(Controls.key_pitch_forward_down_time/F1_0);
 		}
 		else
@@ -1311,7 +1311,7 @@ void kconfig_read_controls(d_event *event, int automap_flag)
 		if ( Controls.key_pitch_backward_state )
 		{
 			if ( Controls.key_pitch_backward_down_time < F1_0 )
-				Controls.key_pitch_backward_down_time += FrameTime*((float)PlayerCfg.KeyboardSens[1]/4);
+				Controls.key_pitch_backward_down_time += (!Controls.key_pitch_backward_down_time)?F1_0*((float)PlayerCfg.KeyboardSens[1]/16)+1:FrameTime/4;
 			Controls.pitch_time -= speed_factor*FrameTime/2*(Controls.key_pitch_backward_down_time/F1_0);
 		}
 		else
@@ -1336,7 +1336,7 @@ void kconfig_read_controls(d_event *event, int automap_flag)
 		if ( Controls.key_pitch_forward_state ) 
 		{
 			if (Controls.key_pitch_forward_down_time < F1_0)
-				Controls.key_pitch_forward_down_time += FrameTime*((float)PlayerCfg.KeyboardSens[3]/4);
+				Controls.key_pitch_forward_down_time += (!Controls.key_pitch_forward_down_time)?F1_0*((float)PlayerCfg.KeyboardSens[3]/16)+1:FrameTime/4;
 			Controls.vertical_thrust_time += speed_factor*FrameTime*(Controls.key_pitch_forward_down_time/F1_0);
 		}
 		else
@@ -1344,7 +1344,7 @@ void kconfig_read_controls(d_event *event, int automap_flag)
 		if ( Controls.key_pitch_backward_state )
 		{
 			if ( Controls.key_pitch_backward_down_time < F1_0 )
-				Controls.key_pitch_backward_down_time += FrameTime*((float)PlayerCfg.KeyboardSens[3]/4);
+				Controls.key_pitch_backward_down_time += (!Controls.key_pitch_backward_down_time)?F1_0*((float)PlayerCfg.KeyboardSens[3]/16)+1:FrameTime/4;
 			Controls.vertical_thrust_time -= speed_factor*FrameTime*(Controls.key_pitch_backward_down_time/F1_0);
 		}
 		else
@@ -1364,7 +1364,7 @@ void kconfig_read_controls(d_event *event, int automap_flag)
 	if ( Controls.key_slide_up_state ) 
 	{
 		if (Controls.key_slide_up_down_time < F1_0)
-			Controls.key_slide_up_down_time += FrameTime*((float)PlayerCfg.KeyboardSens[3]/4);
+			Controls.key_slide_up_down_time += (!Controls.key_slide_up_down_time)?F1_0*((float)PlayerCfg.KeyboardSens[3]/16)+1:FrameTime/4;
 		Controls.vertical_thrust_time += speed_factor*FrameTime*(Controls.key_slide_up_down_time/F1_0);
 	}
 	else
@@ -1372,7 +1372,7 @@ void kconfig_read_controls(d_event *event, int automap_flag)
 	if ( Controls.key_slide_down_state )
 	{
 		if ( Controls.key_slide_down_down_time < F1_0 )
-			Controls.key_slide_down_down_time += FrameTime*((float)PlayerCfg.KeyboardSens[3]/4);
+			Controls.key_slide_down_down_time += (!Controls.key_slide_down_down_time)?F1_0*((float)PlayerCfg.KeyboardSens[3]/16)+1:FrameTime/4;
 		Controls.vertical_thrust_time -= speed_factor*FrameTime*(Controls.key_slide_down_down_time/F1_0);
 	}
 	else
@@ -1398,7 +1398,7 @@ void kconfig_read_controls(d_event *event, int automap_flag)
 		if ( Controls.key_heading_right_state ) 
 		{
 			if (Controls.key_heading_right_down_time < F1_0)
-				Controls.key_heading_right_down_time += FrameTime*((float)PlayerCfg.KeyboardSens[0]/4);
+				Controls.key_heading_right_down_time += (!Controls.key_heading_right_down_time)?F1_0*((float)PlayerCfg.KeyboardSens[0]/16)+1:FrameTime/4;
 			Controls.heading_time += speed_factor*FrameTime*(Controls.key_heading_right_down_time/F1_0);
 		}
 		else
@@ -1406,7 +1406,7 @@ void kconfig_read_controls(d_event *event, int automap_flag)
 		if ( Controls.key_heading_left_state )
 		{
 			if ( Controls.key_heading_left_down_time < F1_0 )
-				Controls.key_heading_left_down_time += FrameTime*((float)PlayerCfg.KeyboardSens[0]/4);
+				Controls.key_heading_left_down_time += (!Controls.key_heading_left_down_time)?F1_0*((float)PlayerCfg.KeyboardSens[0]/16)+1:FrameTime/4;
 			Controls.heading_time -= speed_factor*FrameTime*(Controls.key_heading_left_down_time/F1_0);
 		}
 		else
@@ -1431,7 +1431,7 @@ void kconfig_read_controls(d_event *event, int automap_flag)
 		if ( Controls.key_heading_right_state ) 
 		{
 			if (Controls.key_heading_right_down_time < F1_0)
-				Controls.key_heading_right_down_time += FrameTime*((float)PlayerCfg.KeyboardSens[2]/4);
+				Controls.key_heading_right_down_time += (!Controls.key_heading_right_down_time)?F1_0*((float)PlayerCfg.KeyboardSens[2]/16)+1:FrameTime/4;
 			Controls.sideways_thrust_time += speed_factor*FrameTime*(Controls.key_heading_right_down_time/F1_0);
 		}
 		else
@@ -1439,7 +1439,7 @@ void kconfig_read_controls(d_event *event, int automap_flag)
 		if ( Controls.key_heading_left_state )
 		{
 			if ( Controls.key_heading_left_down_time < F1_0 )
-				Controls.key_heading_left_down_time += FrameTime*((float)PlayerCfg.KeyboardSens[2]/4);
+				Controls.key_heading_left_down_time += (!Controls.key_heading_left_down_time)?F1_0*((float)PlayerCfg.KeyboardSens[2]/16)+1:FrameTime/4;
 			Controls.sideways_thrust_time -= speed_factor*FrameTime*(Controls.key_heading_left_down_time/F1_0);
 		}
 		else
@@ -1459,7 +1459,7 @@ void kconfig_read_controls(d_event *event, int automap_flag)
 	if ( Controls.key_slide_right_state ) 
 	{
 		if (Controls.key_slide_right_down_time < F1_0)
-			Controls.key_slide_right_down_time += FrameTime*((float)PlayerCfg.KeyboardSens[2]/4);
+			Controls.key_slide_right_down_time += (!Controls.key_slide_right_down_time)?F1_0*((float)PlayerCfg.KeyboardSens[2]/16)+1:FrameTime/4;
 		Controls.sideways_thrust_time += speed_factor*FrameTime*(Controls.key_slide_right_down_time/F1_0);
 	}
 	else
@@ -1467,7 +1467,7 @@ void kconfig_read_controls(d_event *event, int automap_flag)
 	if ( Controls.key_slide_left_state )
 	{
 		if ( Controls.key_slide_left_down_time < F1_0 )
-			Controls.key_slide_left_down_time += FrameTime*((float)PlayerCfg.KeyboardSens[2]/4);
+			Controls.key_slide_left_down_time += (!Controls.key_slide_left_down_time)?F1_0*((float)PlayerCfg.KeyboardSens[1]/16)+1:FrameTime/4;
 		Controls.sideways_thrust_time -= speed_factor*FrameTime*(Controls.key_slide_left_down_time/F1_0);
 	}
 	else
@@ -1493,7 +1493,7 @@ void kconfig_read_controls(d_event *event, int automap_flag)
 		if ( Controls.key_heading_left_state )
 		{
 			if ( Controls.key_heading_left_down_time < F1_0 )
-				Controls.key_heading_left_down_time += FrameTime*((float)PlayerCfg.KeyboardSens[4]/4);
+				Controls.key_heading_left_down_time += (!Controls.key_heading_left_down_time)?F1_0*((float)PlayerCfg.KeyboardSens[4]/16)+1:FrameTime/4;
 			Controls.bank_time += speed_factor*FrameTime*(Controls.key_heading_left_down_time/F1_0);
 		}
 		else
@@ -1501,7 +1501,7 @@ void kconfig_read_controls(d_event *event, int automap_flag)
 		if ( Controls.key_heading_right_state ) 
 		{
 			if (Controls.key_heading_right_down_time < F1_0)
-				Controls.key_heading_right_down_time += FrameTime*((float)PlayerCfg.KeyboardSens[4]/4);
+				Controls.key_heading_right_down_time += (!Controls.key_heading_right_down_time)?F1_0*((float)PlayerCfg.KeyboardSens[4]/16)+1:FrameTime/4;
 			Controls.bank_time -= speed_factor*FrameTime*(Controls.key_heading_right_down_time/F1_0);
 		}
 		else
@@ -1521,7 +1521,7 @@ void kconfig_read_controls(d_event *event, int automap_flag)
 	if ( Controls.key_bank_left_state )
 	{
 		if ( Controls.key_bank_left_down_time < F1_0 )
-			Controls.key_bank_left_down_time += FrameTime*((float)PlayerCfg.KeyboardSens[4]/4);
+			Controls.key_bank_left_down_time += (!Controls.key_bank_left_down_time)?F1_0*((float)PlayerCfg.KeyboardSens[4]/16)+1:FrameTime/4;
 		Controls.bank_time += speed_factor*FrameTime*(Controls.key_bank_left_down_time/F1_0);
 	}
 	else
@@ -1529,7 +1529,7 @@ void kconfig_read_controls(d_event *event, int automap_flag)
 	if ( Controls.key_bank_right_state ) 
 	{
 		if (Controls.key_bank_right_down_time < F1_0)
-			Controls.key_bank_right_down_time += FrameTime*((float)PlayerCfg.KeyboardSens[4]/4);
+			Controls.key_bank_right_down_time += (!Controls.key_bank_right_down_time)?F1_0*((float)PlayerCfg.KeyboardSens[4]/16)+1:FrameTime/4;
 		Controls.bank_time -= speed_factor*FrameTime*(Controls.key_bank_right_down_time/F1_0);
 	}
 	else