diff --git a/Docs/Changelog_sm-ssc.txt b/Docs/Changelog_sm-ssc.txt
index ab77018f44..fec245837a 100644
--- a/Docs/Changelog_sm-ssc.txt
+++ b/Docs/Changelog_sm-ssc.txt
@@ -19,6 +19,7 @@ sm-ssc v1.2.5 | 201104??
 * [LifeMeterBattery] Convert Frame to an AutoActor. [AJ]
 * [ScreenEvaluation] Added RollingNumbersClass metric, allowing for the ability
   to change which RollingNumbers class is loaded. [AJ]
+* [ScreenGameplay] Added SongNumberFormat metric. [AJ]
 
 20110420
 --------
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index a40103a604..1e78056217 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -3192,6 +3192,7 @@ DebugX=SCREEN_CENTER_X
 DebugY=SCREEN_BOTTOM-72
 DebugOnCommand=zoom,0.75
 #
+SongNumberFormat="%d"
 SongNumberP1X=THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX") - 60
 SongNumberP1Y=SCREEN_TOP+24+7
 SongNumberP1OnCommand=visible,false
diff --git a/src/ScreenGameplay.cpp b/src/ScreenGameplay.cpp
index e6b84cca04..0b7b51d0cb 100644
--- a/src/ScreenGameplay.cpp
+++ b/src/ScreenGameplay.cpp
@@ -588,6 +588,7 @@ void ScreenGameplay::Init()
 		if( GAMESTATE->IsCourseMode() )
 		{
 			ASSERT( pi->m_ptextCourseSongNumber == NULL );
+			SONG_NUMBER_FORMAT.Load( m_sName, "SongNumberFormat" );
 			pi->m_ptextCourseSongNumber = new BitmapText;
 			pi->m_ptextCourseSongNumber->LoadFromFont( THEME->GetPathF(m_sName,"SongNum") );
 			pi->m_ptextCourseSongNumber->SetName( ssprintf("SongNumber%s",pi->GetName().c_str()) );
@@ -1011,7 +1012,7 @@ void ScreenGameplay::LoadNextSong()
 	{
 		pi->GetPlayerStageStats()->m_iSongsPlayed++;
 		if( pi->m_ptextCourseSongNumber )
-			pi->m_ptextCourseSongNumber->SetText( ssprintf("%d", pi->GetPlayerStageStats()->m_iSongsPassed+1) );
+			pi->m_ptextCourseSongNumber->SetText( ssprintf(SONG_NUMBER_FORMAT.GetValue(), pi->GetPlayerStageStats()->m_iSongsPassed+1) );
 	}
 
 	if( GAMESTATE->m_bMultiplayer )
diff --git a/src/ScreenGameplay.h b/src/ScreenGameplay.h
index f3d0d096aa..89c4cf60c8 100644
--- a/src/ScreenGameplay.h
+++ b/src/ScreenGameplay.h
@@ -193,6 +193,7 @@ protected:
 	ThemeMetric<int> FAIL_ON_MISS_COMBO;
 	ThemeMetric<bool> ALLOW_CENTER_1_PLAYER;
 	ThemeMetric<bool> UNPAUSE_WITH_START;
+	ThemeMetric<RString> SONG_NUMBER_FORMAT;
 
 	bool IsLastSong();
 	void SetupSong( int iSongIndex );