diff --git a/stepmania/src/RageFileManager.cpp b/stepmania/src/RageFileManager.cpp
index 8b01ee1b96..51655f8113 100644
--- a/stepmania/src/RageFileManager.cpp
+++ b/stepmania/src/RageFileManager.cpp
@@ -38,6 +38,10 @@ public:
 	{
 		FDB->AddFile( MountPoint, 0, 0 );
 	}
+	void Delete( const CString &MountPoint )
+	{
+		FDB->DelFile( MountPoint );
+	}
 };
 static RageFileDriverMountpoints *g_Mountpoints = NULL;
 
@@ -277,6 +281,9 @@ void RageFileManager::Mount( CString Type, CString Root, CString MountPoint )
 {
 	LockMut( *g_Mutex );
 
+	// unmount anything that was previously mounted here.
+	Unmount(MountPoint);
+
 	if( MountPoint.size() && MountPoint.Right(1) != "/" )
 		MountPoint += '/';
 	ASSERT( Root != "" );
@@ -297,6 +304,17 @@ void RageFileManager::Mount( CString Type, CString Root, CString MountPoint )
 	g_Mountpoints->Add( MountPoint );
 }
 
+void RageFileManager::Unmount( CString MountPoint )
+{
+	LockMut( *g_Mutex );
+
+	for( unsigned i = 0; i < g_Drivers.size(); ++i )
+		if( !g_Drivers[i].MountPoint.CompareNoCase( MountPoint ) )
+			g_Drivers.erase( g_Drivers.begin()+i );
+
+	g_Mountpoints->Delete( MountPoint );
+}
+
 bool RageFileManager::IsMounted( CString MountPoint )
 {
 	LockMut( *g_Mutex );
diff --git a/stepmania/src/RageFileManager.h b/stepmania/src/RageFileManager.h
index d8bf5bfe4c..7c0050654e 100644
--- a/stepmania/src/RageFileManager.h
+++ b/stepmania/src/RageFileManager.h
@@ -28,6 +28,7 @@ public:
 	int GetFileHash( const CString &sPath );
 
 	void Mount( CString Type, CString RealPath, CString MountPoint );
+	void Unmount( CString MountPoint );
 	bool IsMounted( CString MountPoint );
 	bool MountpointIsReady( CString MountPoint );