Index: src/game/g_cmds.c
===================================================================
--- src/game/g_cmds.c	(revision 1056)
+++ src/game/g_cmds.c	(working copy)
@@ -1555,6 +1555,7 @@
   vec3_t    mins, maxs;
   int       num;
   gentity_t *other;
+  vec3_t    oldVel;
 
   if( ent->client->ps.stats[ STAT_HEALTH ] <= 0 )
     return;
@@ -1649,7 +1650,9 @@
           ent->client->pers.classSelection = newClass;
           ClientUserinfoChanged( clientNum );
           VectorCopy( infestOrigin, ent->s.pos.trBase );
+		  VectorCopy( ent->client->ps.velocity, oldVel );
           ClientSpawn( ent, ent, ent->s.pos.trBase, ent->s.apos.trBase );
+		  VectorCopy( oldVel, ent->client->ps.velocity );
         }
         else
         {