diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp
index a1e6e0bab2..83a11d9ba8 100644
--- a/stepmania/src/StepMania.dsp
+++ b/stepmania/src/StepMania.dsp
@@ -59,8 +59,8 @@ IntDir=.\../Release
 TargetDir=\stepmania\stepmania
 TargetName=StepMania
 SOURCE="$(InputPath)"
-PreLink_Cmds=verinc   	cl    /Zl    /nologo    /c    verstub.cpp    /Fo$(IntDir)\ 
-PostBuild_Cmds=mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
+PreLink_Cmds=disasm\verinc   	cl    /Zl    /nologo    /c    verstub.cpp    /Fo$(IntDir)\ 
+PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "StepMania - Win32 Debug"
@@ -95,8 +95,8 @@ IntDir=.\../Debug
 TargetDir=\stepmania\stepmania
 TargetName=StepMania-debug
 SOURCE="$(InputPath)"
-PreLink_Cmds=verinc   	cl    /Zl    /nologo    /c    verstub.cpp    /Fo$(IntDir)\ 
-PostBuild_Cmds=mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
+PreLink_Cmds=disasm\verinc   	cl    /Zl    /nologo    /c    verstub.cpp    /Fo$(IntDir)\ 
+PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
 # End Special Build Tool
 
 !ENDIF 
diff --git a/stepmania/src/StepMania.vcproj b/stepmania/src/StepMania.vcproj
index 4f3e12e3d2..add3798a8c 100644
--- a/stepmania/src/StepMania.vcproj
+++ b/stepmania/src/StepMania.vcproj
@@ -63,8 +63,9 @@
 				CommandLine="mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="verinc
-cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\"/>
+				CommandLine="disasm\verinc
+cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
+"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -87,7 +88,7 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\"/>
 			WholeProgramOptimization="TRUE">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/EHa"
+				AdditionalOptions="/EHa "
 				Optimization="3"
 				GlobalOptimizations="TRUE"
 				InlineFunctionExpansion="2"
@@ -133,11 +134,12 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\"/>
 				TypeLibraryName=".\../StepMania.tlb"/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi"/>
+				CommandLine="disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi"/>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="verinc
-cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\"/>
+				CommandLine="disasm\verinc
+cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
+"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
diff --git a/stepmania/src/disasm/mapconv.exe b/stepmania/src/disasm/mapconv.exe
new file mode 100644
index 0000000000..629bc1ddc4
Binary files /dev/null and b/stepmania/src/disasm/mapconv.exe differ
diff --git a/stepmania/src/disasm/verinc.exe b/stepmania/src/disasm/verinc.exe
new file mode 100644
index 0000000000..1a5eda7e42
Binary files /dev/null and b/stepmania/src/disasm/verinc.exe differ