diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index 5d3429b050..0f25708e2d 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -8,6 +8,13 @@ ________________________________________________________________________________
 StepMania 5.0 $next | 20111xxx
 --------------------------------------------------------------------------------
 
+2011/11/28
+----------
+* [ScreenGameplay] Add the SurvivalModOverride metric. Let the themer decide
+  if mods should be overridden on survival or not. Funny enough, this used
+  to be true for the old Oni style mode, but...well, we'll cross that bridge
+  later. [Wolfman2000]
+
 2011/11/27
 ----------
 * [PlayerOptions] Pretty large changes here, namely a bunch of new bindings.
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 56381a96ab..43774a6577 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -3075,6 +3075,7 @@ SecondsBetweenComments=10.0
 ScoreKeeperClass=ScoreKeeperClass()
 TickEarlySeconds=0
 LightsMode="LightsMode_Gameplay"
+SurvivalModOverride=true
 #
 PlayerType="Player"
 # useful in some obscure situations where the theme resolution has been increased.
diff --git a/src/ScreenGameplay.cpp b/src/ScreenGameplay.cpp
index 697ce089dd..6e71bf91fe 100644
--- a/src/ScreenGameplay.cpp
+++ b/src/ScreenGameplay.cpp
@@ -70,6 +70,7 @@
 static ThemeMetric<float> INITIAL_BACKGROUND_BRIGHTNESS	("ScreenGameplay","InitialBackgroundBrightness");
 static ThemeMetric<float> SECONDS_BETWEEN_COMMENTS	("ScreenGameplay","SecondsBetweenComments");
 static ThemeMetric<RString> SCORE_KEEPER_CLASS		("ScreenGameplay","ScoreKeeperClass");
+static ThemeMetric<bool> SURVIVAL_MOD_OVERRIDE ("ScreenGameplay","SurvivalModOverride");
 
 AutoScreenMessage( SM_PlayGo );
 
@@ -831,7 +832,7 @@ void ScreenGameplay::InitSongQueues()
 			}
 
 			// In a survival course, override stored mods
-			if( pCourse->GetCourseType() == COURSE_TYPE_SURVIVAL )
+			if( pCourse->GetCourseType() == COURSE_TYPE_SURVIVAL && SURVIVAL_MOD_OVERRIDE )
 			{
 				pi->GetPlayerState()->m_PlayerOptions.FromString( ModsLevel_Stage, 
 										 "clearall,"
diff --git a/src/ScreenGameplay.h b/src/ScreenGameplay.h
index 182d12ed31..fee3d0d97d 100644
--- a/src/ScreenGameplay.h
+++ b/src/ScreenGameplay.h
@@ -197,6 +197,7 @@ protected:
 	ThemeMetric<bool> ALLOW_CENTER_1_PLAYER;
 	ThemeMetric<bool> UNPAUSE_WITH_START;
 	ThemeMetric<RString> SONG_NUMBER_FORMAT;
+	ThemeMetric<bool> SURVIVAL_MOD_OVERRIDE;
 
 	bool IsLastSong();
 	void SetupSong( int iSongIndex );