diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index 7c23e67d14..295f47fd0e 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -6,11 +6,13 @@ ________________________________________________________________________________
 
 2012/05/16
 ----------
-* [ScreenWithMenuElements] Added DelayMusicSeconds metric.
+* [ScreenWithMenuElements] Added DelayMusicSeconds metric. [AJ]
+* [ScreenOptionsMasterPrefs] Allow for FastLoadAdditionalSongs preference
+  to be called via the "conf" command. [AJ]
 
 2012/05/14
 ----------
-* [Course] Added AllSongsAreFixed() Lua binding.
+* [Course] Added AllSongsAreFixed() Lua binding. [AJ]
 
 ================================================================================
 StepMania 5.0 alpha 2 | 20120504
diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini
index 9677f6624d..2489e45e35 100644
--- a/Themes/_fallback/Languages/en.ini
+++ b/Themes/_fallback/Languages/en.ini
@@ -378,6 +378,7 @@ EventMode=When set to &oq;ON&cq;, and you can continue playing forever.  Failing
 Exit=
 Fail=Fail
 FastLoad=If enabled, don't check songs for changes on load.
+FastLoadAdditionalSongs=If enabled, don't check songs for changes to Additional Songs on load.
 Fill Machine Stats=
 Game=Change the current game type with this option.
 GetRankingName=Determines if name entry should never be shown, always be shown, or shown when the course is listed on the high scores screen.
@@ -916,6 +917,7 @@ Exit=Exit
 Fail=Fail
 Fakes=Fakes
 FastLoad=Fast\nLoad
+FastLoadAdditionalSongs=Fast Load\nAdditional Songs
 File1 Global BGAnimation=File1 Global BGAnimation
 File1 Global Movie=File1 Global Movie
 File1 Global Movie (Group + Genre)=File1 Global Movie (Group + Genre)
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 631d525f25..e445c49c40 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -2888,7 +2888,7 @@ Line20="conf,VisualDelaySeconds"
 Fallback="ScreenOptionsServiceChild"
 NextScreen="ScreenOptionsService"
 PrevScreen="ScreenOptionsService"
-LineNames="Score,3,4,8,11,13,14,15,16,28,29,30"
+LineNames="Score,3,4,8,11,13,14,15,16,28,29,30,31"
 LineScore="lua,UserPrefScoringMode()"
 Line3="conf,TimingWindowScale"
 Line4="conf,LifeDifficulty"
@@ -2901,6 +2901,7 @@ Line16="conf,UseUnlockSystem"
 Line28="conf,AutogenSteps"
 Line29="conf,AutogenGroupCourses"
 Line30="conf,FastLoad"
+Line31="conf,FastLoadAdditionalSongs"
 
 # unused options
 #Line2="conf,ScoringType"
diff --git a/src/ScreenOptionsMasterPrefs.cpp b/src/ScreenOptionsMasterPrefs.cpp
index a3fd2305c8..6993cefeb6 100644
--- a/src/ScreenOptionsMasterPrefs.cpp
+++ b/src/ScreenOptionsMasterPrefs.cpp
@@ -678,6 +678,7 @@ static void InitializeConfOptions()
 
 	ADD( ConfOption( "AutogenGroupCourses",		MovePref<bool>,		"Off","On" ) );
 	ADD( ConfOption( "FastLoad",			MovePref<bool>,		"Off","On" ) );
+	ADD( ConfOption( "FastLoadAdditionalSongs",			MovePref<bool>,		"Off","On" ) );
 
 	// Background options
 	ADD( ConfOption( "RandomBackgroundMode",	MovePref<RandomBackgroundMode>, "Off","Animations","Random Movies" ) );