diff --git a/Engine/bin/nasm/nasm.exe b/Engine/bin/nasm/nasm.exe
new file mode 100644
index 000000000..a220b4223
Binary files /dev/null and b/Engine/bin/nasm/nasm.exe differ
diff --git a/Engine/bin/nasm/nasmw.exe b/Engine/bin/nasm/nasmw.exe
deleted file mode 100644
index dc6b0cc52..000000000
Binary files a/Engine/bin/nasm/nasmw.exe and /dev/null differ
diff --git a/Engine/bin/nasm/ndisasm.exe b/Engine/bin/nasm/ndisasm.exe
new file mode 100644
index 000000000..3fa9feb64
Binary files /dev/null and b/Engine/bin/nasm/ndisasm.exe differ
diff --git a/Engine/bin/nasm/ndisasmw.exe b/Engine/bin/nasm/ndisasmw.exe
deleted file mode 100644
index b38bdf440..000000000
Binary files a/Engine/bin/nasm/ndisasmw.exe and /dev/null differ
diff --git a/Tools/projectGenerator/templates/vc2010_fileRecurse.tpl b/Tools/projectGenerator/templates/vc2010_fileRecurse.tpl
index d8af59604..6d0ea49b2 100644
--- a/Tools/projectGenerator/templates/vc2010_fileRecurse.tpl
+++ b/Tools/projectGenerator/templates/vc2010_fileRecurse.tpl
@@ -27,11 +27,11 @@
    {else}
       {if substr($dirWalk->path, -4, 4) == ".asm"}
          <CustomBuild Include="{$dirWalk->path|replace:'//':'/'|replace:'/':'\\'}">
-            <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"{$binDir|replace:'//':'/'|replace:'/':'\\'}nasm\nasmw.exe" -f win32 "%(FullPath)" -o "$(IntDir)%(Filename).obj"</Command>
+            <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"{$binDir|replace:'//':'/'|replace:'/':'\\'}nasm\nasm.exe" -f win32 "%(FullPath)" -o "$(IntDir)%(Filename).obj"</Command>
             <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename).obj;%(Outputs)</Outputs>
-            <Command Condition="'$(Configuration)|$(Platform)'=='Optimized Debug|Win32'">"{$binDir|replace:'//':'/'|replace:'/':'\\'}nasm\nasmw.exe" -f win32 "%(FullPath)" -o "$(IntDir)%(Filename).obj"</Command>
+            <Command Condition="'$(Configuration)|$(Platform)'=='Optimized Debug|Win32'">"{$binDir|replace:'//':'/'|replace:'/':'\\'}nasm\nasm.exe" -f win32 "%(FullPath)" -o "$(IntDir)%(Filename).obj"</Command>
             <Outputs Condition="'$(Configuration)|$(Platform)'=='Optimized Debug|Win32'">$(IntDir)%(Filename).obj;%(Outputs)</Outputs>
-            <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"{$binDir|replace:'//':'/'|replace:'/':'\\'}nasm\nasmw.exe" -f win32 "%(FullPath)" -o "$(IntDir)%(Filename).obj"</Command>
+            <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"{$binDir|replace:'//':'/'|replace:'/':'\\'}nasm\nasm.exe" -f win32 "%(FullPath)" -o "$(IntDir)%(Filename).obj"</Command>
             <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename).obj;%(Outputs)</Outputs>
          </CustomBuild>
       {elseif $projOutput->isSourceFile( $dirWalk->path ) }
diff --git a/Tools/projectGenerator/templates/vc2k8_fileRecurse.tpl b/Tools/projectGenerator/templates/vc2k8_fileRecurse.tpl
index 33ad9361a..42709769e 100644
--- a/Tools/projectGenerator/templates/vc2k8_fileRecurse.tpl
+++ b/Tools/projectGenerator/templates/vc2k8_fileRecurse.tpl
@@ -65,21 +65,21 @@
 		Name="Debug|Win32">
 		<Tool
 			Name="VCCustomBuildTool"
-			CommandLine="&quot;{$binDir|replace:'//':'/'|replace:'/':'\\'}nasm\nasmw.exe&quot; -f win32 &quot;$(InputPath)&quot; -o &quot;$(IntDir)/$(InputName).obj&quot;"
+			CommandLine="&quot;{$binDir|replace:'//':'/'|replace:'/':'\\'}nasm\nasm.exe&quot; -f win32 &quot;$(InputPath)&quot; -o &quot;$(IntDir)/$(InputName).obj&quot;"
 			Outputs="$(IntDir)/$(InputName).obj"/>
 	</FileConfiguration>
 	<FileConfiguration
 		Name="Optimized Debug|Win32">
 		<Tool
 			Name="VCCustomBuildTool"
-			CommandLine="&quot;{$binDir|replace:'//':'/'|replace:'/':'\\'}nasm\nasmw.exe&quot; -f win32 &quot;$(InputPath)&quot; -o &quot;$(IntDir)/$(InputName).obj&quot;"
+			CommandLine="&quot;{$binDir|replace:'//':'/'|replace:'/':'\\'}nasm\nasm.exe&quot; -f win32 &quot;$(InputPath)&quot; -o &quot;$(IntDir)/$(InputName).obj&quot;"
 			Outputs="$(IntDir)/$(InputName).obj"/>
 	</FileConfiguration>
 	<FileConfiguration
 		Name="Release|Win32">
 		<Tool
 			Name="VCCustomBuildTool"
-         CommandLine="&quot;{$binDir|replace:'//':'/'|replace:'/':'\\'}nasm\nasmw.exe&quot; -f win32 &quot;$(InputPath)&quot; -o &quot;$(IntDir)/$(InputName).obj&quot;"
+         CommandLine="&quot;{$binDir|replace:'//':'/'|replace:'/':'\\'}nasm\nasm.exe&quot; -f win32 &quot;$(InputPath)&quot; -o &quot;$(IntDir)/$(InputName).obj&quot;"
 			Outputs="$(IntDir)/$(InputName).obj"/>
 	</FileConfiguration>
 {/if}{* if path == "*.asm" *}