diff --git a/stepmania/src/NotesLoaderSM.cpp b/stepmania/src/NotesLoaderSM.cpp
index 6bbaf71baa..91009eb4c4 100644
--- a/stepmania/src/NotesLoaderSM.cpp
+++ b/stepmania/src/NotesLoaderSM.cpp
@@ -215,6 +215,9 @@ bool SMLoader::LoadFromSMFile( CString sPath, Song &out )
 		else if( 0==stricmp(sValueName,"ARTISTTRANSLIT") )
 			out.m_sArtistTranslit = sParams[1];
 
+		else if( 0==stricmp(sValueName,"GENRE") )
+			out.m_sGenre = sParams[1];
+
 		else if( 0==stricmp(sValueName,"CREDIT") )
 			out.m_sCredit = sParams[1];
 
diff --git a/stepmania/src/NotesWriterSM.cpp b/stepmania/src/NotesWriterSM.cpp
index 2a7fbd2f70..ac9bd31692 100644
--- a/stepmania/src/NotesWriterSM.cpp
+++ b/stepmania/src/NotesWriterSM.cpp
@@ -19,6 +19,7 @@ void NotesWriterSM::WriteGlobalTags( RageFile &f, const Song &out )
 	f.PutLine( ssprintf( "#TITLETRANSLIT:%s;", out.m_sMainTitleTranslit.c_str() ) );
 	f.PutLine( ssprintf( "#SUBTITLETRANSLIT:%s;", out.m_sSubTitleTranslit.c_str() ) );
 	f.PutLine( ssprintf( "#ARTISTTRANSLIT:%s;", out.m_sArtistTranslit.c_str() ) );
+	f.PutLine( ssprintf( "#GENRE:%s;", out.m_sGenre.c_str() ) );
 	f.PutLine( ssprintf( "#CREDIT:%s;", out.m_sCredit.c_str() ) );
 	f.PutLine( ssprintf( "#BANNER:%s;", out.m_sBannerFile.c_str() ) );
 	f.PutLine( ssprintf( "#BACKGROUND:%s;", out.m_sBackgroundFile.c_str() ) );
diff --git a/stepmania/src/song.h b/stepmania/src/song.h
index 6646980239..63b1f1fde3 100644
--- a/stepmania/src/song.h
+++ b/stepmania/src/song.h
@@ -111,6 +111,8 @@ public:
 	CString GetFullDisplayTitle() const;
 	CString GetFullTranslitTitle() const;
 
+	CString m_sGenre;
+
 	/* This is read and saved, but never actually used. */
 	CString	m_sCredit;