diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index f61343d8a6..5f2adbfa8f 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -13,6 +13,9 @@ StepMania 5.0 Preview 2 | 201106??
 * [UnlockManager] New metric: AutoLockEditSteps. Use this to hide bonus charts
   until the Expert steps are beaten. No guarantee that this works with no
   challenge steps in the song. [Wolfman2000]
+* [UnlockManager] New metric: SongsNotAdditional. Set to true to keep the
+  default behavior, false to have the AdditionalSongs folder contain
+  unlockable material. This is set to true to start. [Wolfman2000]
 
 2011/06/24
 ----------
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index f648fbfabd..cfa9b78afb 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -125,6 +125,7 @@ ExtraColor=color("#ff0000")	-- red
 # Unlock specific things.
 AutoLockChallengeSteps=false
 AutoLockEditSteps=false
+SongsNotAdditional=true
 UnlockNames=""
 
 # useful commands:
diff --git a/src/UnlockManager.cpp b/src/UnlockManager.cpp
index 4bc21f5495..b3d045d649 100644
--- a/src/UnlockManager.cpp
+++ b/src/UnlockManager.cpp
@@ -26,6 +26,7 @@ UnlockManager*	UNLOCKMAN = NULL;	// global and accessable from anywhere in our p
 
 static ThemeMetric<bool> AUTO_LOCK_CHALLENGE_STEPS( "UnlockManager", "AutoLockChallengeSteps" );
 static ThemeMetric<bool> AUTO_LOCK_EDIT_STEPS( "UnlockManager", "AutoLockEditSteps" );
+static ThemeMetric<bool> SONGS_NOT_ADDITIONAL( "UnlockManager", "SongsNotAdditional" );
 
 static const char *UnlockRequirementNames[] =
 {
@@ -520,7 +521,7 @@ void UnlockManager::Load()
 			if( SongUtil::GetOneSteps(*s, StepsType_Invalid, Difficulty_Challenge) == NULL )
 				continue;
 
-			if( SONGMAN->WasLoadedFromAdditionalSongs(*s) )
+			if( SONGS_NOT_ADDITIONAL && SONGMAN->WasLoadedFromAdditionalSongs(*s) )
 				continue;
 				
 			UnlockEntry ue;			
@@ -546,7 +547,7 @@ void UnlockManager::Load()
 				continue;
 			
 			// don't add additional songs.
-			if (SONGMAN->WasLoadedFromAdditionalSongs(*s))
+			if (SONGS_NOT_ADDITIONAL && SONGMAN->WasLoadedFromAdditionalSongs(*s))
 				continue;
 			
 			UnlockEntry ue;