diff --git a/stepmania/src/BackgroundUtil.cpp b/stepmania/src/BackgroundUtil.cpp
index d85729ac97..ffd520e79e 100644
--- a/stepmania/src/BackgroundUtil.cpp
+++ b/stepmania/src/BackgroundUtil.cpp
@@ -92,7 +92,7 @@ static void StripCvs( vector<RString> &vsPathsToStrip, vector<RString> &vsNamesT
 	ASSERT( vsPathsToStrip.size() == vsNamesToStrip.size() );
 	for( unsigned i=0; i<vsNamesToStrip.size(); i++ )
 	{
-		if( vsNamesToStrip[i].Right(3).CompareNoCase("CVS") == 0 )
+		if( vsNamesToStrip[i].Right(3).CompareNoCase("CVS") == 0 || vsNamesToStrip[i] == ".svn" )
 		{
 			vsPathsToStrip.erase( vsPathsToStrip.begin()+i );
 			vsNamesToStrip.erase( vsNamesToStrip.begin()+i );
diff --git a/stepmania/src/RageUtil.cpp b/stepmania/src/RageUtil.cpp
index f88a4a5c16..90b53a3065 100644
--- a/stepmania/src/RageUtil.cpp
+++ b/stepmania/src/RageUtil.cpp
@@ -1154,13 +1154,14 @@ RString URLEncode( const RString &sStr )
 	return sOutput;
 }
 
+static bool CVSOrSVN( const RString& s )
+{
+	return s.Right(3).CompareNoCase("CVS") == 0 || s == ".svn";
+}
+
 void StripCvs( vector<RString> &vs )
 {
-	for( unsigned i=0; i<vs.size(); i++ )
-	{
-		if( vs[i].Right(3).CompareNoCase("CVS") == 0 )
-			vs.erase( vs.begin()+i );
-	}
+	RemoveIf( vs, CVSOrSVN );
 }
 
 /* path is a .redir pathname.  Read it and return the real one. */