diff --git a/cryptdll.vcxproj b/cryptdll.vcxproj
index 5fbee2111..be4d2ec37 100644
--- a/cryptdll.vcxproj
+++ b/cryptdll.vcxproj
@@ -173,6 +173,11 @@
       <Command>ml64.exe /c /nologo /D_M_X64 /W3 /Zi /Fo"$(IntDir)x64dll.obj" "%(FullPath)"</Command>
       <Outputs>$(IntDir)x64dll.obj;%(Outputs)</Outputs>
     </CustomBuild>
+    <CustomBuild Condition="'$(Platform)'=='x64' AND ('$(Configuration)'=='Debug' Or '$(Configuration)'=='Release')" Include="cpuid64.asm">
+      <Message>Building and assembling cpuid64.asm</Message>
+      <Command>ml64.exe /c /nologo /D_M_X64 /W3 /Zi /Fo"$(IntDir)cpuid64.obj" "%(FullPath)"</Command>
+      <Outputs>$(IntDir)cpuid64.obj;%(Outputs)</Outputs>
+    </CustomBuild>
   </ItemGroup>
   <!-- Source Files -->
   <ItemGroup>
diff --git a/cryptdll.vcxproj.filters b/cryptdll.vcxproj.filters
index 4b3d1a861..d8f026bb4 100644
--- a/cryptdll.vcxproj.filters
+++ b/cryptdll.vcxproj.filters
@@ -449,5 +449,8 @@
     <CustomBuild Include="x64dll.asm">
       <Filter>Source Files</Filter>
     </CustomBuild>
+    <CustomBuild Include="cpuid64.asm">
+      <Filter>Source Files</Filter>
+    </CustomBuild>
   </ItemGroup>
 </Project>
diff --git a/cryptlib.vcxproj b/cryptlib.vcxproj
index 91dd1c171..d4d3a79d7 100644
--- a/cryptlib.vcxproj
+++ b/cryptlib.vcxproj
@@ -368,8 +368,8 @@
     <None Include="Readme.txt" />
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Condition="'$(Platform)'=='x64'" Include="cpuid64.asm">
-      <Message>Building and Assembling cpuid64.asm</Message>
+    <CustomBuild Condition="'$(Platform)'=='x64' AND ('$(Configuration)'=='Debug' Or '$(Configuration)'=='Release')" Include="cpuid64.asm">
+      <Message>Building and assembling cpuid64.asm</Message>
       <Command>ml64.exe /c /nologo /D_M_X64 /W3 /Zi /Fo"$(IntDir)cpuid64.obj" "%(FullPath)"</Command>
       <Outputs>$(IntDir)cpuid64.obj;%(Outputs)</Outputs>
     </CustomBuild>