diff -Nru tremulous/src/game/g_active.c tremulous.temp/src/game/g_active.c
--- tremulous/src/game/g_active.c	2007-04-15 17:59:03.000000000 +0200
+++ tremulous.temp/src/game/g_active.c	2007-04-15 18:49:22.000000000 +0200
@@ -1320,7 +1320,10 @@
   if( msec > 200 )
     msec = 200;
 
-  client->unlaggedTime = ucmd->serverTime;
+  if( ucmd->serverTime < level.time - g_unlagged.integer )
+     client->unlaggedTime = level.time - g_unlagged.integer;
+  else
+     client->unlaggedTime = ucmd->serverTime;
 
   if( pmove_msec.integer < 8 )
     trap_Cvar_Set( "pmove_msec", "8" );
diff -Nru tremulous/src/game/g_main.c tremulous.temp/src/game/g_main.c
--- tremulous/src/game/g_main.c	2007-04-15 17:59:14.000000000 +0200
+++ tremulous.temp/src/game/g_main.c	2007-04-15 18:49:56.000000000 +0200
@@ -233,7 +233,7 @@
   { &g_alienStage2Threshold, "g_alienStage2Threshold", DEFAULT_ALIEN_STAGE2_THRESH, 0, 0, qfalse  },
   { &g_alienStage3Threshold, "g_alienStage3Threshold", DEFAULT_ALIEN_STAGE3_THRESH, 0, 0, qfalse  },
   
-  { &g_unlagged, "g_unlagged", "1", CVAR_SERVERINFO | CVAR_ARCHIVE, 0, qfalse  },
+  { &g_unlagged, "g_unlagged", "1000", CVAR_SERVERINFO | CVAR_ARCHIVE, 0, qfalse  },
 
   { &g_disabledEquipment, "g_disabledEquipment", "", CVAR_ROM, 0, qfalse  },
   { &g_disabledClasses, "g_disabledClasses", "", CVAR_ROM, 0, qfalse  },