Index: src/game/g_client.c
===================================================================
--- src/game/g_client.c	(revision 853)
+++ src/game/g_client.c	(working copy)
@@ -1472,7 +1472,8 @@
 
   if( client->sess.sessionTeam != TEAM_SPECTATOR )
     client->pers.maxHealth = client->ps.stats[ STAT_MAX_HEALTH ] =
-      BG_FindHealthForClass( ent->client->pers.classSelection );
+      ( int )( BG_FindHealthForClass( ent->client->pers.classSelection ) *
+      atoi( Info_ValueForKey( userinfo, "handicap" ) ) / 100 );
   else
     client->pers.maxHealth = client->ps.stats[ STAT_MAX_HEALTH ] = 100;