diff --git a/Docs/Changelog_sm-ssc.txt b/Docs/Changelog_sm-ssc.txt
index 2f8b6cb7e0..3b86b619b0 100644
--- a/Docs/Changelog_sm-ssc.txt
+++ b/Docs/Changelog_sm-ssc.txt
@@ -20,6 +20,7 @@ sm-ssc v1.2.1 | 2011011?
   [Wolfman2000]
 * [Player] Allow Combo Stopped message to be flexible via metrics. The
   default is 50, as it was before. [Wolfman2000]
+* [Player] Allow the default attack time to be changed. [Wolfman2000]
 
 20110112
 --------
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 3fa9058d52..23665c7518 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -939,6 +939,7 @@ RollBodyIncrementsCombo=GetGamePrefB("UserPrefComboOnRolls")
 ScoreMissedHoldsAndRolls=ScoreMissedHoldsAndRolls()
 PercentUntilColorCombo=0.25
 ComboStoppedAt=50
+AttackRunTimeDefault=6
 
 [PlayerShared]
 Fallback="Player"
diff --git a/src/Player.cpp b/src/Player.cpp
index bdc9534382..b155795ecd 100644
--- a/src/Player.cpp
+++ b/src/Player.cpp
@@ -139,6 +139,7 @@ ThemeMetric<bool> CHECKPOINTS_TAPS_SEPARATE_JUDGMENT	( "Player", "CheckpointsTap
 ThemeMetric<bool> SCORE_MISSED_HOLDS_AND_ROLLS ( "Player", "ScoreMissedHoldsAndRolls" ); // sm-ssc addition
 ThemeMetric<float> PERCENT_UNTIL_COLOR_COMBO ( "Player", "PercentUntilColorCombo" );
 ThemeMetric<int> COMBO_STOPPED_AT ( "Player", "ComboStoppedAt" );
+ThemeMetric<float> ATTACK_RUN_TIME_DEFAULT ( "Player", "AttackRunTimeDefault" );
 
 float Player::GetWindowSeconds( TimingWindow tw )
 {
@@ -642,8 +643,7 @@ void Player::Update( float fDeltaTime )
 		{
 			float fCurrentGameTime = STATSMAN->m_CurStageStats.m_fGameplaySeconds;
 
-			// Should we hardcode this, or make it a preference/theme metric? ~ Mike
-			const float fAttackRunTime = 6.0f;
+			const float fAttackRunTime = ATTACK_RUN_TIME_DEFAULT;
 
 			// Don't start until 1 seconds into game, minimum
 			if( fCurrentGameTime > 1.0f )