diff --git a/engine/client/cl_ents.c b/engine/client/cl_ents.c
index 05f1f3096..d90fa2292 100644
--- a/engine/client/cl_ents.c
+++ b/engine/client/cl_ents.c
@@ -2906,9 +2906,26 @@ void CL_LinkViewModel(void)
 		return;
 
 	if (cl.stats[r_refdef.currentplayernum][STAT_ITEMS] & IT_QUAD)
-		ent.flags |= Q2RF_SHELL_BLUE;
+	{
+		if (v_powerupshell.value == 2)
+		{
+			ent.forcedshader = R_RegisterCustom("powerups/quadWeapon", Shader_DefaultSkinShell);
+			V_AddEntity(&ent);
+		}
+		else
+			ent.flags |= Q2RF_SHELL_BLUE;
+	}
 	if (cl.stats[r_refdef.currentplayernum][STAT_ITEMS] & IT_INVULNERABILITY)
-		ent.flags |= Q2RF_SHELL_RED;
+	{
+		if (v_powerupshell.value == 2)
+		{
+			ent.forcedshader = R_RegisterCustom("powerups/regen", Shader_DefaultSkinShell);
+			ent.fatness = -2.5;
+			V_AddEntity(&ent);
+		}
+		else
+			ent.flags |= Q2RF_SHELL_RED;
+	}
 
 	if (!(ent.flags & (Q2RF_SHELL_RED|Q2RF_SHELL_GREEN|Q2RF_SHELL_BLUE)))
 		return;
diff --git a/engine/client/cl_main.c b/engine/client/cl_main.c
index 47aadda15..41628b72a 100644
--- a/engine/client/cl_main.c
+++ b/engine/client/cl_main.c
@@ -48,6 +48,7 @@ cvar_t	cl_hudswap	= {"cl_hudswap", "0", NULL, CVAR_ARCHIVE};
 cvar_t	cl_maxfps	= {"cl_maxfps", "1000", NULL, CVAR_ARCHIVE};
 cvar_t	cl_nopext	= {"cl_nopext", "0", NULL, CVAR_ARCHIVE};
 cvar_t	cl_nolerp	= {"cl_nolerp", "1"};
+cvar_t	hud_tracking_show = {"hud_tracking_show", "1"};
 
 cvar_t	cfg_save_name = {"cfg_save_name", "fte", NULL, CVAR_ARCHIVE};
 
@@ -2606,6 +2607,7 @@ void CL_Init (void)
 
 	Cvar_Register (&cl_indepphysics, cl_controlgroup);
 	Cvar_Register (&cl_antibunch, "evil hacks");
+	Cvar_Register (&hud_tracking_show, "statusbar");
 
 #ifdef IRCCLIENT
 	Cmd_AddCommand ("irc", CL_IRC_f);
diff --git a/engine/client/sbar.c b/engine/client/sbar.c
index 34bded17b..d426a24c7 100644
--- a/engine/client/sbar.c
+++ b/engine/client/sbar.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
-
+extern cvar_t hud_tracking_show;
 
 //===========================================
 //rogue changed and added defines
@@ -1701,10 +1701,12 @@ void Sbar_Draw (void)
 					else
 						Sbar_DrawNormal (pnum);
 
-	//					Sbar_DrawString (160-14*8+4,4, "SPECTATOR MODE - TRACK CAMERA");
-					sprintf(st, "Tracking %-.64s",
+					if (hud_tracking_show.value)
+					{
+						sprintf(st, "Tracking %-.64s",
 							cl.players[spec_track[pnum]].name);
-					Sbar_DrawFunString(0, -8, st);
+						Sbar_DrawFunString(0, -8, st);
+					}
 				}
 			}
 			else if (sb_showscores || (cl.stats[pnum][STAT_HEALTH] <= 0 && cl.splitclients == 1))