diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 955a590c21..d118e9b90c 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -346,7 +346,7 @@ void ScreenGameplay::Init()
 	START_GIVES_UP.Load(			m_sName, "StartGivesUp" );
 	BACK_GIVES_UP.Load(			m_sName, "BackGivesUp" );
 	GIVING_UP_GOES_TO_PREV_SCREEN.Load(	m_sName, "GivingUpGoesToPrevScreen" );
-	FAIL_AFTER_30_MISSES.Load(		m_sName, "FailAfter30Misses" );
+	FAIL_ON_MISS_COMBO.Load(		m_sName, "FailOnMissCombo" );
 	ALLOW_CENTER_1_PLAYER.Load(		m_sName, "AllowCenter1Player" );
 	
 	if( UseSongBackgroundAndForeground() )
@@ -1722,13 +1722,13 @@ void ScreenGameplay::Update( float fDeltaTime )
 		// update give up
 		//
 		bool bGiveUpTimerFired = !m_GiveUpTimer.IsZero() && m_GiveUpTimer.Ago() > 2.5f;
-		bool bAllHumanHaveComboOf30OrMoreMisses = STATSMAN->m_CurStageStats.GetMinimumMissCombo() >= 30;
-		if( bGiveUpTimerFired || (FAIL_AFTER_30_MISSES && bAllHumanHaveComboOf30OrMoreMisses) )
+		bool bAllHumanHaveBigMissCombo = FAIL_ON_MISS_COMBO.GetValue() != -1 && STATSMAN->m_CurStageStats.GetMinimumMissCombo() >= FAIL_ON_MISS_COMBO;
+		if( bGiveUpTimerFired || bAllHumanHaveBigMissCombo )
 		{
 			STATSMAN->m_CurStageStats.m_bGaveUp = true;
 			FOREACH_EnabledPlayerNumberInfo( m_vPlayerInfo, pi )
 			{
-				pi->GetPlayerStageStats()->m_bFailed |= bAllHumanHaveComboOf30OrMoreMisses;
+				pi->GetPlayerStageStats()->m_bFailed |= bAllHumanHaveBigMissCombo;
 				pi->GetPlayerStageStats()->m_bDisqualified = true;
 			}
 
diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h
index 09b48614d2..297556d6ac 100644
--- a/stepmania/src/ScreenGameplay.h
+++ b/stepmania/src/ScreenGameplay.h
@@ -148,7 +148,7 @@ protected:
 	ThemeMetric<bool> START_GIVES_UP;
 	ThemeMetric<bool> BACK_GIVES_UP;
 	ThemeMetric<bool> GIVING_UP_GOES_TO_PREV_SCREEN;
-	ThemeMetric<bool> FAIL_AFTER_30_MISSES;
+	ThemeMetric<int> FAIL_ON_MISS_COMBO;
 	ThemeMetric<bool> ALLOW_CENTER_1_PLAYER;
 
 	bool IsLastSong();