diff -ruN ioq3base/code/client/cl_input.c ioq3/code/client/cl_input.c
--- ioq3base/code/client/cl_input.c	2008-06-18 20:06:16.000000000 +0200
+++ ioq3/code/client/cl_input.c	2008-06-18 20:31:25.000000000 +0200
@@ -435,41 +435,86 @@
 CL_MouseMove
 =================
 */
+#define FLOATSIGNBITSET(f)		((*(const unsigned int *)&(f)) >> 31)
+
 void CL_MouseMove( usercmd_t *cmd ) {
 	float	mx, my;
-	float	accelSensitivity;
-	float	rate;
+	qboolean verbose = ( cl_mouseAccelDebug->integer != 0 );
+	static FILE *flog = NULL;
+
+	if ( verbose && flog == NULL ) {
+		flog = fopen( "mouse.csv", "w" );
+		fprintf( flog, "mx,my,frame_msec,ratex,ratey,powerx,powery\n" );
+	} else if ( !verbose && flog != NULL ) {
+		fclose( flog );
+		flog = NULL;
+	}
 
 	// allow mouse smoothing
 	if ( m_filter->integer ) {
-		mx = ( cl.mouseDx[0] + cl.mouseDx[1] ) * 0.5;
-		my = ( cl.mouseDy[0] + cl.mouseDy[1] ) * 0.5;
+		mx = ( cl.mouseDx[0] + cl.mouseDx[1] ) * 0.5f;
+		my = ( cl.mouseDy[0] + cl.mouseDy[1] ) * 0.5f;
 	} else {
-		mx = cl.mouseDx[cl.mouseIndex];
-		my = cl.mouseDy[cl.mouseIndex];
+		mx = cl.mouseDx[ cl.mouseIndex ];
+		my = cl.mouseDy[ cl.mouseIndex ];
 	}
 	cl.mouseIndex ^= 1;
-	cl.mouseDx[cl.mouseIndex] = 0;
-	cl.mouseDy[cl.mouseIndex] = 0;
+	cl.mouseDx[ cl.mouseIndex ] = 0;
+	cl.mouseDy[ cl.mouseIndex ] = 0;
 
-	rate = sqrt( mx * mx + my * my ) / (float)frame_msec;
-	accelSensitivity = ( cl_sensitivity->value *
-			cl_platformSensitivity->value ) + rate * cl_mouseAccel->value;
+	if ( mx == 0.0f && my == 0.0f ) {
+		return;
+	}
+	
+	if ( verbose ) {
+		fprintf( flog, "%g,%g,%d,", mx, my, frame_msec );
+	}
 
-	// scale by FOV
-	accelSensitivity *= cl.cgameSensitivity;
+	if ( cl_mouseAccel->value != 0.0f ) {
+		if ( cl_mouseAccelStyle->integer == 0 ) {
+			float accelSensitivity;
+			float rate;
+			rate = sqrt( mx * mx + my * my ) / (float)frame_msec;
+
+			accelSensitivity = cl_sensitivity->value + rate * cl_mouseAccel->value;
+			mx *= accelSensitivity;
+			my *= accelSensitivity;
+		} else {
+			// sensitivity remains pretty much unchanged at low speeds
+			// cl_mouseAccel is a power value to how the acceleration is shaped
+			// cl_mouseAccelOffset is the rate for which the acceleration will have doubled the non accelerated amplification
+			// NOTE: decouple the config cvars for independent acceleration setup along X and Y?
+
+			float	rate[2];
+			float	power[2];
+			
+			rate[0] = fabs( mx ) / (float)frame_msec;
+			rate[1] = fabs( my ) / (float)frame_msec;
+			power[0] = powf( rate[0] / cl_mouseAccelOffset->value, cl_mouseAccel->value );
+			power[1] = powf( rate[1] / cl_mouseAccelOffset->value, cl_mouseAccel->value );
+
+			mx = cl_sensitivity->value * ( mx + ( 1.0f - 2.0f * FLOATSIGNBITSET( mx ) ) * power[0] * cl_mouseAccelOffset->value );
+			my = cl_sensitivity->value * ( my + ( 1.0f - 2.0f * FLOATSIGNBITSET( my ) ) * power[1] * cl_mouseAccelOffset->value );
+			
+			if ( verbose ) {
+				fprintf( flog, "%g,%g,%g,%g,", rate[0], rate[1], power[0], power[1] );
+			}
 
-	if ( rate && cl_showMouseRate->integer ) {
-		Com_Printf( "%f : %f\n", rate, accelSensitivity );
-	}
+		}
 
-	mx *= accelSensitivity;
-	my *= accelSensitivity;
+	} else {
+		mx *= cl_sensitivity->value;
+		my *= cl_sensitivity->value;
+	}
 
-	if (!mx && !my) {
-		return;
+	if ( verbose ) {
+		fprintf( flog, "\n" );
 	}
 
+	// ingame FOV
+	mx *= cl.cgameSensitivity;
+	my *= cl.cgameSensitivity;
+
 	// add mouse X/Y movement to cmd
 	if ( in_strafe.active ) {
 		cmd->rightmove = ClampChar( cmd->rightmove + m_side->value * mx );
diff -ruN ioq3base/code/client/cl_main.c ioq3/code/client/cl_main.c
--- ioq3base/code/client/cl_main.c	2008-06-18 20:06:16.000000000 +0200
+++ ioq3/code/client/cl_main.c	2008-06-18 20:31:25.000000000 +0200
@@ -73,6 +73,9 @@
 
 cvar_t	*cl_mouseAccel;
 cvar_t	*cl_showMouseRate;
+cvar_t	*cl_mouseAccelOffset;
+cvar_t	*cl_mouseAccelStyle;
+cvar_t	*cl_mouseAccelDebug;
 
 cvar_t	*m_pitch;
 cvar_t	*m_yaw;
@@ -3018,6 +3021,14 @@
 	cl_mouseAccel = Cvar_Get ("cl_mouseAccel", "0", CVAR_ARCHIVE);
 	cl_freelook = Cvar_Get( "cl_freelook", "1", CVAR_ARCHIVE );
 
+	// 0: legacy mouse acceleration
+	// 1: new implementation
+	cl_mouseAccelStyle = Cvar_Get( "cl_mouseAccelStyle", "0", CVAR_ARCHIVE );
+	// offset for the power function (for style 1, ignored otherwise)
+	// this should be set to the max rate value
+	cl_mouseAccelOffset = Cvar_Get( "cl_mouseAccelOffset", "5", CVAR_ARCHIVE );
+	cl_mouseAccelDebug = Cvar_Get( "cl_mouseAccelDebug", "0", 0 );
+
 	cl_showMouseRate = Cvar_Get ("cl_showmouserate", "0", 0);
 
 	cl_allowDownload = Cvar_Get ("cl_allowDownload", "0", CVAR_ARCHIVE);
diff -ruN ioq3base/code/client/client.h ioq3/code/client/client.h
--- ioq3base/code/client/client.h	2008-06-18 20:06:16.000000000 +0200
+++ ioq3/code/client/client.h	2008-06-18 20:31:25.000000000 +0200
@@ -382,6 +382,10 @@
 extern	cvar_t	*cl_mouseAccel;
 extern	cvar_t	*cl_showMouseRate;
 
+extern	cvar_t	*cl_mouseAccelOffset;
+extern	cvar_t	*cl_mouseAccelStyle;
+extern	cvar_t	*cl_mouseAccelDebug;
+
 extern	cvar_t	*m_pitch;
 extern	cvar_t	*m_yaw;
 extern	cvar_t	*m_forward;
diff -ruN ioq3base/ql-mouse-accel.txt ioq3/ql-mouse-accel.txt
--- ioq3base/ql-mouse-accel.txt	1970-01-01 01:00:00.000000000 +0100
+++ ioq3/ql-mouse-accel.txt	2008-06-18 20:31:25.000000000 +0200
@@ -0,0 +1,33 @@
+This patch comes with an alternate set of cvars to configure and tweak mouse acceleration. Nothing fundamentally new but it's a bit easier to setup mouse acceleration, and it's an option offered in QUAKE LIVE which I'm contributing to the GPL'ed quake3 source already.
+
+Below is a bit of documentation I posted about the system.
+
+TTimo
+
+--
+
+I've been using an experimental mouse acceleration code for a while, and decided to make it available to everyone.
+
+Don't be too worried if you don't understand the explanations below, this is mostly intended for advanced players:
+
+To enable it, set cl_mouseAccelStyle 1 (0 is the default/legacy behavior)
+
+New style is controlled with 3 cvars:
+sensitivity
+cl_mouseAccelOffset
+cl_mouseAccel
+
+The old code (cl_mouseAccelStyle 0) can be difficult to calibrate because if you have a base sensitivity setup, as soon as you set a non zero acceleration your base sensitivity at low speeds will change as well. The other problem with style 0 is that you are stuck on a square (power of two) acceleration curve.
+
+The new code tries to solve both problems:
+
+Once you setup your sensitivity to feel comfortable and accurate enough for low mouse deltas with no acceleration (cl_mouseAccel 0), you can start increasing cl_mouseAccel and tweaking cl_mouseAccelOffset to get the amplification you want for high deltas with little effect on low mouse deltas.
+
+cl_mouseAccel is a power value. Should be >= 1, 2 will be the same power curve as style 0. The higher the value, the faster the amplification grows with the mouse delta.
+
+cl_mouseAccelOffset sets how much base mouse delta will be doubled by acceleration. The closer to zero you bring it, the more acceleration will happen at low speeds. This is also very useful if you are changing to a new mouse with higher dpi, if you go from 500 to 1000 dpi, you can divide your cl_mouseAccelOffset by two to keep the same overall 'feel' (you will likely gain in precision when you do that, but that is not related to mouse acceleration).
+
+
+Mouse acceleration is tricky to configure, and when you do you'll have to re-learn your aiming. But you will find that it's very much forth it in the long run.
+
+If you try the new acceleration code and start using it, I'd be very interested by your feedback.