diff --git a/game/client/in_main.cpp b/game/client/in_main.cpp
index 12b5f0dccc..04ce6b3cbe 100644
--- a/game/client/in_main.cpp
+++ b/game/client/in_main.cpp
@@ -1333,8 +1333,9 @@ void CInput::CreateMove ( int sequence_number, float input_sample_frametime, boo
     }
 
     static ConVarRef cl_showhitboxes("cl_showhitboxes");
-
-    if (cl_showhitboxes.GetBool())
+    static ConVarRef cl_showfirebullethitboxes("cl_showfirebullethitboxes");
+    
+    if (cl_showhitboxes.GetBool() || cl_showfirebullethitboxes.GetBool())
     {
         cmd->debug_hitboxes = true;
     }
diff --git a/game/shared/cstrike/cs_player_shared.cpp b/game/shared/cstrike/cs_player_shared.cpp
index a4f56e6931..6b652bd636 100644
--- a/game/shared/cstrike/cs_player_shared.cpp
+++ b/game/shared/cstrike/cs_player_shared.cpp
@@ -35,6 +35,7 @@
 
 ConVar sv_showimpacts("sv_showimpacts", "0", FCVAR_REPLICATED, "Shows client (red) and server (blue) bullet impact point (1=both, 2=client-only, 3=server-only)" );
 ConVar weapon_accuracy_nospread( "weapon_accuracy_nospread", "0", FCVAR_REPLICATED );
+ConVar cl_showfirebullethitboxes( "cl_showfirebullethitboxes", "0" );
 
 #define	CS_MASK_SHOOT (MASK_SOLID|CONTENTS_DEBRIS)
 
@@ -463,7 +464,7 @@ void CCSPlayer::FireBullet(
 #ifdef CLIENT_DLL
     static ConVarRef cl_showhitboxes("cl_showhitboxes");
 
-	if( cl_showhitboxes.GetBool() )
+	if( cl_showhitboxes.GetBool() || cl_showfirebullethitboxes.GetBool() )
     {
         for (int i = 1; i <= gpGlobals->maxClients; i++)
         {