diff --git a/src/CourseWriterCRS.cpp b/src/CourseWriterCRS.cpp
index 5d7db95e3c..af72517d96 100644
--- a/src/CourseWriterCRS.cpp
+++ b/src/CourseWriterCRS.cpp
@@ -128,6 +128,14 @@ bool CourseWriterCRS::Write( const Course &course, RageFileBasic &f, bool bSavin
 		{
 			f.Write( ssprintf( "#SONG:WORST%d", entry.iChooseIndex+1 ) );
 		}
+		else if( entry.songSort == SongSort_TopGrades && entry.iChooseIndex != -1 )
+		{
+			f.Write( ssprintf( "#SONG:GRADEBEST%d", entry.iChooseIndex + 1 ) );
+		}
+		else if( entry.songSort == SongSort_LowestGrades && entry.iChooseIndex != -1 )
+		{
+			f.Write( ssprintf( "#SONG:GRADEWORST%d", entry.iChooseIndex + 1 ) );
+		}
 		else if( entry.songID.ToSong() )
 		{
 			Song *pSong = entry.songID.ToSong();