diff --git a/build.rs b/build.rs
index 9625f2e561..6f4a16e42b 100644
--- a/build.rs
+++ b/build.rs
@@ -135,6 +135,8 @@ fn build_c_code(out_dir: &str) -> Result<(), std::env::VarError> {
             format!("/p:Configuration={}", configuration),
             format!("/p:OutRootDir={}/", out_dir),
         ];
+
+        println!("cargo:rustc-link-lib=static={}-asm", LIB_NAME);
     }
 
     if !std::process::Command::new(command_name)
diff --git a/crypto/libring-asm.Windows.vcxproj b/crypto/libring-asm.Windows.vcxproj
new file mode 100644
index 0000000000..a6ab277e23
--- /dev/null
+++ b/crypto/libring-asm.Windows.vcxproj
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="GenerateAsm;Build" ToolsVersion="14.0"
+    xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{5A09BA1C-748F-40A2-B7F0-8108A08FE6A8}</ProjectGuid>
+    <ProjectName>libring-asm.Windows</ProjectName>
+    <TargetName>ring-asm</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+  </PropertyGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="..\mk\Windows.props" />
+  </ImportGroup>
+  <PropertyGroup Label="Configuration">
+    <OutDir>$(OutRootDir)lib\</OutDir>
+  </PropertyGroup>
+  <ItemGroup Condition="'$(ProcessorArchitecture)' == 'x86'">
+    <PerlAsm Include="aes/asm/aes-586.pl" />
+    <PerlAsm Include="aes/asm/aesni-x86.pl" />
+    <PerlAsm Include="aes/asm/vpaes-x86.pl" />
+    <PerlAsm Include="bn/asm/x86-mont.pl" />
+    <PerlAsm Include="chacha/asm/chacha-x86.pl" />
+    <PerlAsm Include="ec/asm/ecp_nistz256-x86.pl" />
+    <PerlAsm Include="modes/asm/ghash-x86.pl" />
+    <PerlAsm Include="poly1305/asm/poly1305-x86.pl" />
+    <PerlAsm Include="sha/asm/sha256-586.pl" />
+    <PerlAsm Include="sha/asm/sha512-586.pl" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(ProcessorArchitecture)' == 'amd64'">
+    <PerlAsm Include="aes/asm/aes-x86_64.pl" />
+    <PerlAsm Include="aes/asm/aesni-x86_64.pl" />
+    <PerlAsm Include="aes/asm/bsaes-x86_64.pl" />
+    <PerlAsm Include="aes/asm/vpaes-x86_64.pl" />
+    <PerlAsm Include="bn/asm/rsaz-avx2.pl" />
+    <PerlAsm Include="bn/asm/x86_64-mont.pl" />
+    <PerlAsm Include="bn/asm/x86_64-mont5.pl" />
+    <PerlAsm Include="chacha/asm/chacha-x86_64.pl" />
+    <!-- XXX: curve25519/asm/x25519-asm-x86_64.S doesn't support Windows. -->
+    <PerlAsm Include="ec/asm/ecp_nistz256-x86_64.pl" />
+    <PerlAsm Include="ec/asm/p256-x86_64-asm.pl" />
+    <PerlAsm Include="modes/asm/aesni-gcm-x86_64.pl" />
+    <PerlAsm Include="modes/asm/ghash-x86_64.pl" />
+    <PerlAsm Include="poly1305/asm/poly1305-x86_64.pl" />
+    <PerlAsm Include="sha/asm/sha256-x86_64.pl">
+      <AdditionalDependencies>sha/asm/sha-x86_64.pl</AdditionalDependencies>
+    </PerlAsm>
+    <PerlAsm Include="sha/asm/sha512-x86_64.pl">
+      <AdditionalDependencies>sha/asm/sha-x86_64.pl</AdditionalDependencies>
+    </PerlAsm>
+  </ItemGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="..\mk\perlasm-msbuild.targets" />
+</Project>
diff --git a/crypto/libring.Windows.vcxproj b/crypto/libring.Windows.vcxproj
index dccb30f7af..70715c74cb 100644
--- a/crypto/libring.Windows.vcxproj
+++ b/crypto/libring.Windows.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="GenerateAsm;Build" ToolsVersion="14.0"
+<Project DefaultTargets="Build" ToolsVersion="14.0"
     xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="Globals">
     <ProjectGuid>{F4C0A1B6-5E09-41C8-8242-3E1F6762FB18}</ProjectGuid>
@@ -64,41 +64,6 @@
     <ClInclude Include="rand\internal.h" />
     <ClInclude Include="rsa\internal.h" />
   </ItemGroup>
-  <ItemGroup Condition="'$(ProcessorArchitecture)' == 'x86'">
-    <PerlAsm Include="aes/asm/aes-586.pl" />
-    <PerlAsm Include="aes/asm/aesni-x86.pl" />
-    <PerlAsm Include="aes/asm/vpaes-x86.pl" />
-    <PerlAsm Include="bn/asm/x86-mont.pl" />
-    <PerlAsm Include="chacha/asm/chacha-x86.pl" />
-    <PerlAsm Include="ec/asm/ecp_nistz256-x86.pl" />
-    <PerlAsm Include="modes/asm/ghash-x86.pl" />
-    <PerlAsm Include="poly1305/asm/poly1305-x86.pl" />
-    <PerlAsm Include="sha/asm/sha256-586.pl" />
-    <PerlAsm Include="sha/asm/sha512-586.pl" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(ProcessorArchitecture)' == 'amd64'">
-    <PerlAsm Include="aes/asm/aes-x86_64.pl" />
-    <PerlAsm Include="aes/asm/aesni-x86_64.pl" />
-    <PerlAsm Include="aes/asm/bsaes-x86_64.pl" />
-    <PerlAsm Include="aes/asm/vpaes-x86_64.pl" />
-    <PerlAsm Include="bn/asm/rsaz-avx2.pl" />
-    <PerlAsm Include="bn/asm/x86_64-mont.pl" />
-    <PerlAsm Include="bn/asm/x86_64-mont5.pl" />
-    <PerlAsm Include="chacha/asm/chacha-x86_64.pl" />
-    <!-- XXX: curve25519/asm/x25519-asm-x86_64.S doesn't support Windows. -->
-    <ClCompile Include="curve25519\x25519-x86_64.c" />
-    <PerlAsm Include="ec/asm/ecp_nistz256-x86_64.pl" />
-    <PerlAsm Include="ec/asm/p256-x86_64-asm.pl" />
-    <PerlAsm Include="modes/asm/aesni-gcm-x86_64.pl" />
-    <PerlAsm Include="modes/asm/ghash-x86_64.pl" />
-    <PerlAsm Include="poly1305/asm/poly1305-x86_64.pl" />
-    <PerlAsm Include="sha/asm/sha256-x86_64.pl">
-      <AdditionalDependencies>sha/asm/sha-x86_64.pl</AdditionalDependencies>
-    </PerlAsm>
-    <PerlAsm Include="sha/asm/sha512-x86_64.pl">
-      <AdditionalDependencies>sha/asm/sha-x86_64.pl</AdditionalDependencies>
-    </PerlAsm>
-  </ItemGroup>
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\include</AdditionalIncludeDirectories>
@@ -106,7 +71,4 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\mk\perlasm-msbuild.targets" />
-  </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/ring.sln b/ring.sln
index 27f453c9f5..382768c451 100644
--- a/ring.sln
+++ b/ring.sln
@@ -5,7 +5,9 @@ VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 12.0.21005.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libring.Windows", "crypto\libring.Windows.vcxproj", "{F4C0A1B6-5E09-41C8-8242-3E1F6762FB18}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libring-test.Windows", "crypto\libring-test.Windows.vcxproj", "{1DACE503-6498-492D-B1FF-F9EE18624443}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libring-asm.Windows", "crypto\libring-asm.Windows.vcxproj", "{5A09BA1C-748F-40A2-B7F0-8108A08FE6A8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtest.Windows", "crypto\libring-test.Windows.vcxproj", "{1DACE503-6498-492D-B1FF-F9EE18624443}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -31,6 +33,14 @@ Global
 		{1DACE503-6498-492D-B1FF-F9EE18624443}.Release|Win32.Build.0 = Release|Win32
 		{1DACE503-6498-492D-B1FF-F9EE18624443}.Release|x64.ActiveCfg = Release|x64
 		{1DACE503-6498-492D-B1FF-F9EE18624443}.Release|x64.Build.0 = Release|x64
+		{5A09BA1C-748F-40A2-B7F0-8108A08FE6A8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5A09BA1C-748F-40A2-B7F0-8108A08FE6A8}.Debug|Win32.Build.0 = Debug|Win32
+		{5A09BA1C-748F-40A2-B7F0-8108A08FE6A8}.Debug|x64.ActiveCfg = Debug|x64
+		{5A09BA1C-748F-40A2-B7F0-8108A08FE6A8}.Debug|x64.Build.0 = Debug|x64
+		{5A09BA1C-748F-40A2-B7F0-8108A08FE6A8}.Release|Win32.ActiveCfg = Release|Win32
+		{5A09BA1C-748F-40A2-B7F0-8108A08FE6A8}.Release|Win32.Build.0 = Release|Win32
+		{5A09BA1C-748F-40A2-B7F0-8108A08FE6A8}.Release|x64.ActiveCfg = Release|x64
+		{5A09BA1C-748F-40A2-B7F0-8108A08FE6A8}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE