Index: src/game/g_cmds.c
===================================================================
--- src/game/g_cmds.c	(revision 1055)
+++ src/game/g_cmds.c	(working copy)
@@ -1562,6 +1562,7 @@
   vec3_t    mins, maxs;
   int       num;
   gentity_t *other;
+  int       oldBoostedTime = 0;
 
   if( ent->client->ps.stats[ STAT_HEALTH ] <= 0 )
     return;
@@ -1656,7 +1657,14 @@
           ent->client->pers.classSelection = newClass;
           ClientUserinfoChanged( clientNum );
           VectorCopy( infestOrigin, ent->s.pos.trBase );
+          if( ent->client->ps.stats[ STAT_STATE ] & SS_BOOSTED )
+            oldBoostedTime = ent->client->lastBoostedTime;
           ClientSpawn( ent, ent, ent->s.pos.trBase, ent->s.apos.trBase );
+		  if( oldBoostedTime )
+          {
+            ent->client->ps.stats[ STAT_STATE ] |= SS_BOOSTED;
+            ent->client->lastBoostedTime = oldBoostedTime;
+          }
           return;
         }
         else