diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d75ade3..86d0a981 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,6 +66,7 @@ option(CROWBAR_FIX_RAPID_CROWBAR "Enable rapid crowbar fix" OFF)
 option(GAUSS_OVERCHARGE_FIX "Enable gauss overcharge fix" OFF)
 option(TRIPMINE_BEAM_DUPLICATION_FIX "Enable fix of tripmine beam duplication on level transition" OFF)
 option(HANDGRENADE_DEPLOY_FIX "Enable handgrenade deploy animation fix after finishing a throw" OFF)
+option(WEAPONS_ANIMATION_TIMES_FIX "Enable animation times fix for some weapons" OFF)
 option(OEM_BUILD "Enable OEM Build" OFF)
 option(HLDEMO_BUILD "Enable Demo Build" OFF)
 
@@ -148,6 +149,11 @@ if(HANDGRENADE_DEPLOY_FIX)
 	add_definitions(-DHANDGRENADE_DEPLOY_FIX)
 endif()
 
+if(WEAPONS_ANIMATION_TIMES_FIX)
+	message(STATUS "Weapons animation times fix enabled")
+	add_definitions(-DWEAPONS_ANIMATION_TIMES_FIX)
+endif()
+
 if(OEM_BUILD)
 	message(STATUS "OEM build enabled")
 	add_definitions(-DOEM_BUILD)
diff --git a/dlls/crowbar.cpp b/dlls/crowbar.cpp
index f1b2393b..5342e7c2 100644
--- a/dlls/crowbar.cpp
+++ b/dlls/crowbar.cpp
@@ -366,7 +366,7 @@ void CCrowbar::WeaponIdle( void )
 			if( flRand > 0.5f )
 			{
 				iAnim = CROWBAR_IDLE;
-				m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 70.0f / 30.0f;
+				m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 70.0f / 25.0f;
 			}
 			else
 			{
diff --git a/dlls/rpg.cpp b/dlls/rpg.cpp
index 65f1bd49..c81e6246 100644
--- a/dlls/rpg.cpp
+++ b/dlls/rpg.cpp
@@ -518,8 +518,11 @@ void CRpg::WeaponIdle( void )
 				iAnim = RPG_FIDGET_UL;
 			else
 				iAnim = RPG_FIDGET;
-
+#if WEAPONS_ANIMATION_TIMES_FIX
+			m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 6.1f;
+#else
 			m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 3.0f;
+#endif
 		}
 
 		SendWeaponAnim( iAnim );
diff --git a/dlls/satchel.cpp b/dlls/satchel.cpp
index 528a3ba8..38ebec08 100644
--- a/dlls/satchel.cpp
+++ b/dlls/satchel.cpp
@@ -293,14 +293,20 @@ BOOL CSatchel::CanDeploy( void )
 BOOL CSatchel::Deploy()
 {
 	m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 1.0f;
-	m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10.0f, 15.0f );
+	BOOL result;
 
 	if( m_chargeReady )
-		return DefaultDeploy( "models/v_satchel_radio.mdl", "models/p_satchel_radio.mdl", SATCHEL_RADIO_DRAW, "hive" );
+		result = DefaultDeploy( "models/v_satchel_radio.mdl", "models/p_satchel_radio.mdl", SATCHEL_RADIO_DRAW, "hive" );
 	else
-		return DefaultDeploy( "models/v_satchel.mdl", "models/p_satchel.mdl", SATCHEL_DRAW, "trip" );
+		result = DefaultDeploy( "models/v_satchel.mdl", "models/p_satchel.mdl", SATCHEL_DRAW, "trip" );
 	
-	return TRUE;
+#if WEAPONS_ANIMATION_TIMES_FIX
+	if ( result )
+	{
+		m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 2.0f;
+	}
+#endif
+	return result;
 }
 
 void CSatchel::Holster( int skiplocal /* = 0 */ )
diff --git a/dlls/squeakgrenade.cpp b/dlls/squeakgrenade.cpp
index 4bf2e3df..f332a5a8 100644
--- a/dlls/squeakgrenade.cpp
+++ b/dlls/squeakgrenade.cpp
@@ -465,7 +465,14 @@ BOOL CSqueak::Deploy()
 
 	m_pPlayer->m_iWeaponVolume = QUIET_GUN_VOLUME;
 
-	return DefaultDeploy( "models/v_squeak.mdl", "models/p_squeak.mdl", SQUEAK_UP, "squeak" );
+	const BOOL result = DefaultDeploy( "models/v_squeak.mdl", "models/p_squeak.mdl", SQUEAK_UP, "squeak" );
+#if WEAPONS_ANIMATION_TIMES_FIX
+	if ( result )
+	{
+		m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 1.7f;
+	}
+#endif
+	return result;
 }
 
 void CSqueak::Holster( int skiplocal /* = 0 */ )