diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index 5be1958ff2..b66821e760 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -10,7 +10,8 @@ StepMania 5.0 $next | 20111xxx
 
 2011/11/25
 ----------
-* [PlayerStageStats] Hitting a mine no longer gives you full combo. [AJ]
+* [PlayerStageStats] Hitting a mine no longer gives you full combo when
+  [Gameplay] MineHitIncrementsMissCombo=true. [AJ]
 
 2011/11/24
 ----------
diff --git a/src/PlayerStageStats.cpp b/src/PlayerStageStats.cpp
index a48710f5eb..10dd6fcb4e 100644
--- a/src/PlayerStageStats.cpp
+++ b/src/PlayerStageStats.cpp
@@ -19,6 +19,7 @@
 #define GRADE_TIER02_IS_FULL_COMBO THEME->GetMetricB("PlayerStageStats","GradeTier02IsFullCombo")
 
 static ThemeMetric<TapNoteScore> g_MinScoreToMaintainCombo( "Gameplay", "MinScoreToMaintainCombo" );
+static ThemeMetric<bool> g_MineHitIncrementsMissCombo( "Gameplay", "MineHitIncrementsMissCombo" );
 
 const float LESSON_PASS_THRESHOLD = 0.8f;
 
@@ -530,8 +531,8 @@ bool PlayerStageStats::FullComboOfScore( TapNoteScore tnsAllGreaterOrEqual ) con
 			return false;
 	}
 
-	// hit any mines? It's not a full combo.
-	if( m_iTapNoteScores[TNS_HitMine] > 0 )
+	// hit any mines when they increment the miss combo? It's not a full combo.
+	if( g_MineHitIncrementsMissCombo && m_iTapNoteScores[TNS_HitMine] > 0 )
 		return false;
 
 	// If has at least one of the judgments equal to or above, then is a full combo.