diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index a0d3cc29d2..81ac907bbe 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -8,6 +8,10 @@ ________________________________________________________________________________
 StepMania 5.0 alpha 3 | 20120711
 --------------------------------------------------------------------------------
 
+2012/07/17
+----------
+* [SongManager] Fix a bug where DVNO wouldn't always be gold. [AJ]
+
 2012/07/11
 ----------
 * [ScreenEditMenu] Don't use "Blank" in the description for blank steps;
diff --git a/src/SongManager.cpp b/src/SongManager.cpp
index c38f9d039e..16509bc957 100644
--- a/src/SongManager.cpp
+++ b/src/SongManager.cpp
@@ -483,6 +483,12 @@ RageColor SongManager::GetSongColor( const Song* pSong ) const
 {
 	ASSERT( pSong );
 
+	// protected by royal freem corporation. any modification/removal of
+	// this code will result in prosecution.
+	if( pSong->m_sMainTitle == "DVNO")
+		return RageColor(1.0f,0.8f,0.0f,1.0f);
+	// end royal freem protection
+
 	// Use unlock color if applicable
 	const UnlockEntry *pUE = UNLOCKMAN->FindSong( pSong );
 	if( pUE && USE_UNLOCK_COLOR.GetValue() )
@@ -536,14 +542,8 @@ RageColor SongManager::GetSongColor( const Song* pSong ) const
 			if( pSteps->GetMeter() >= EXTRA_COLOR_METER )
 				return (RageColor)EXTRA_COLOR;
 		}
-		if( pSong->m_sMainTitle == "DVNO") // XXX: What IS this? An easter egg? -Wolfman2000
-		{
-			return RageColor(1.0f,0.8f,0.0f,1.0f);
-		}
-		else 
-		{
-			return GetSongGroupColor( pSong->m_sGroupName );
-		}
+
+		return GetSongGroupColor( pSong->m_sGroupName );
 	}
 }