diff --git a/Docs/Changelog_sm-ssc.txt b/Docs/Changelog_sm-ssc.txt
index ba2fc04258..4d102df924 100644
--- a/Docs/Changelog_sm-ssc.txt
+++ b/Docs/Changelog_sm-ssc.txt
@@ -1,7 +1,7 @@
 sm-ssc Changelog
 ________________________________________________________________________________
 The sm-ssc changelog mostly deals with source code-related changes,
-as theme changes happen at a rapid pace.
+as theme changes happen at a faster pace.
 
 Changes are grouped by date.
 Not all changes are documented, for various reasons.
@@ -13,6 +13,16 @@ _____________________________________________________________________________
 sm-ssc v1.2 | 201101xx
 --------------------------------------------------------------------------------
 
+20110106
+--------
+* [SpecialScoring] Fix some minor issues [FSX]
+* New pump routine noteskins [cesarmades]
+* [SongManager] Check the root Songs/ folder for extra stage course files. [freem]
+
+20110102
+--------
+* Fix routine mode saving in the editor. [Wolfman2000]
+
 20110101
 --------
 * [Screen] Added HandleBackButton metric; useful for custom menus that need to
diff --git a/Docs/credits.txt b/Docs/credits.txt
index 34f00fff58..2daa02afa0 100644
--- a/Docs/credits.txt
+++ b/Docs/credits.txt
@@ -59,7 +59,7 @@ Kaox
  * Pump/default noteskin
 
 cesarmades
- * Pump/cmd noteskin
+ * Pump/cmd-* noteskins
 
 David Santamarķa Rogado (howl)
  * Various patches (see Changelog_sm-ssc.txt for more details and links)
@@ -106,6 +106,9 @@ juanelote
  * [SongManager] GetSongGroupByIndex function
  * [MusicWheel] JumpToNextGroup/JumpToPrevGroup logic modifications
 
+NitroX72
+ * Pump/frame noteskin
+
 ==the beta testers==
 [SSC Beta Testing Team]
 KeithD
diff --git a/src/SongManager.cpp b/src/SongManager.cpp
index ddbc09c453..6338654a91 100644
--- a/src/SongManager.cpp
+++ b/src/SongManager.cpp
@@ -1176,9 +1176,14 @@ void SongManager::GetExtraStageInfo( bool bExtra2, const Style *sd, Song*& pSong
 		GAMESTATE->m_pCurSong? GAMESTATE->m_pCurSong->GetSongDir().c_str():"",
 		GAMESTATE->m_pCurSong? GAMESTATE->m_pCurSong->m_sGroupName.c_str():"") );
 
+	// Check preferred group
 	if( GetExtraStageInfoFromCourse(bExtra2, sGroup, pSongOut, pStepsOut) )
 		return;
-	
+
+	// Optionally, check the Songs folder for extra1/2.crs files.
+	if( GetExtraStageInfoFromCourse(bExtra2, "", pSongOut, pStepsOut) )
+		return;
+
 	// Choose a hard song for the extra stage
 	Song*	pExtra1Song = NULL;		// the absolute hardest Song and Steps.  Use this for extra stage 1.
 	Steps*	pExtra1Notes = NULL;