diff --git a/stepmania/src/smpackage/smpackage.opt b/stepmania/src/smpackage/smpackage.opt
index d96c8d6eb0..f67a6a6904 100644
Binary files a/stepmania/src/smpackage/smpackage.opt and b/stepmania/src/smpackage/smpackage.opt differ
diff --git a/stepmania/src/smpackage/smpackageDlg.cpp b/stepmania/src/smpackage/smpackageDlg.cpp
index b9ab0f9168..3f98d56dff 100644
--- a/stepmania/src/smpackage/smpackageDlg.cpp
+++ b/stepmania/src/smpackage/smpackageDlg.cpp
@@ -159,6 +159,32 @@ void CSmpackageDlg::OnButtonExport()
 
 	// Create a new zip file on the desktop
 	CString sZipFileName = sSongName + ".smzip";
+	sZipFileName.Replace( " ", "_" );
+	sZipFileName.Replace( "!", "_" );
+	sZipFileName.Replace( "@", "_" );
+	sZipFileName.Replace( "#", "_" );
+	sZipFileName.Replace( "$", "_" );
+	sZipFileName.Replace( "%", "_" );
+	sZipFileName.Replace( "^", "_" );
+	sZipFileName.Replace( "&", "_" );
+	sZipFileName.Replace( "*", "_" );
+	sZipFileName.Replace( "(", "_" );
+	sZipFileName.Replace( ")", "_" );
+	sZipFileName.Replace( "+", "_" );
+	sZipFileName.Replace( "=", "_" );
+	sZipFileName.Replace( "[", "_" );
+	sZipFileName.Replace( "]", "_" );
+	sZipFileName.Replace( "{", "_" );
+	sZipFileName.Replace( "}", "_" );
+	sZipFileName.Replace( "|", "_" );
+	sZipFileName.Replace( ":", "_" );
+	sZipFileName.Replace( "\'","_" );
+	sZipFileName.Replace( "\"","_" );
+	sZipFileName.Replace( "<", "_" );
+	sZipFileName.Replace( ">", "_" );
+	sZipFileName.Replace( ",", "_" );
+	sZipFileName.Replace( "?", "_" );
+	sZipFileName.Replace( "/", "_" );
 	CString sZipFilePath = sDesktopPath + sZipFileName;
 	//MessageBox( ssprintf("sZipFilePath is '%s'", sZipFilePath), "", MB_OK );
 	try