diff --git a/visualc/VS2010/PolarSSL.vcxproj b/visualc/VS2010/PolarSSL.vcxproj
index 84a23eebe..d1adc0f44 100644
--- a/visualc/VS2010/PolarSSL.vcxproj
+++ b/visualc/VS2010/PolarSSL.vcxproj
@@ -147,6 +147,7 @@
     <ClInclude Include="..\..\include\polarssl\aes.h" />
     <ClInclude Include="..\..\include\polarssl\arc4.h" />
     <ClInclude Include="..\..\include\polarssl\asn1.h" />
+    <ClInclude Include="..\..\include\polarssl\asn1write.h" />
     <ClInclude Include="..\..\include\polarssl\base64.h" />
     <ClInclude Include="..\..\include\polarssl\bignum.h" />
     <ClInclude Include="..\..\include\polarssl\blowfish.h" />
@@ -160,34 +161,48 @@
     <ClInclude Include="..\..\include\polarssl\debug.h" />
     <ClInclude Include="..\..\include\polarssl\des.h" />
     <ClInclude Include="..\..\include\polarssl\dhm.h" />
+    <ClInclude Include="..\..\include\polarssl\ecdh.h" />
+    <ClInclude Include="..\..\include\polarssl\ecdsa.h" />
+    <ClInclude Include="..\..\include\polarssl\ecp.h" />
     <ClInclude Include="..\..\include\polarssl\entropy.h" />
     <ClInclude Include="..\..\include\polarssl\entropy_poll.h" />
     <ClInclude Include="..\..\include\polarssl\error.h" />
+    <ClInclude Include="..\..\include\polarssl\gcm.h" />
     <ClInclude Include="..\..\include\polarssl\havege.h" />
-    <ClInclude Include="..\..\include\polarssl\md.h" />
     <ClInclude Include="..\..\include\polarssl\md2.h" />
     <ClInclude Include="..\..\include\polarssl\md4.h" />
     <ClInclude Include="..\..\include\polarssl\md5.h" />
+    <ClInclude Include="..\..\include\polarssl\md.h" />
     <ClInclude Include="..\..\include\polarssl\md_wrap.h" />
+    <ClInclude Include="..\..\include\polarssl\memory.h" />
     <ClInclude Include="..\..\include\polarssl\net.h" />
+    <ClInclude Include="..\..\include\polarssl\oid.h" />
     <ClInclude Include="..\..\include\polarssl\openssl.h" />
     <ClInclude Include="..\..\include\polarssl\padlock.h" />
+    <ClInclude Include="..\..\include\polarssl\pbkdf2.h" />
     <ClInclude Include="..\..\include\polarssl\pem.h" />
     <ClInclude Include="..\..\include\polarssl\pkcs11.h" />
+    <ClInclude Include="..\..\include\polarssl\pkcs12.h" />
+    <ClInclude Include="..\..\include\polarssl\pkcs5.h" />
+    <ClInclude Include="..\..\include\polarssl\pk.h" />
     <ClInclude Include="..\..\include\polarssl\rsa.h" />
     <ClInclude Include="..\..\include\polarssl\sha1.h" />
-    <ClInclude Include="..\..\include\polarssl\sha2.h" />
-    <ClInclude Include="..\..\include\polarssl\sha4.h" />
+    <ClInclude Include="..\..\include\polarssl\sha256.h" />
+    <ClInclude Include="..\..\include\polarssl\sha512.h" />
+    <ClInclude Include="..\..\include\polarssl\ssl_cache.h" />
+    <ClInclude Include="..\..\include\polarssl\ssl_ciphersuites.h" />
     <ClInclude Include="..\..\include\polarssl\ssl.h" />
     <ClInclude Include="..\..\include\polarssl\timing.h" />
     <ClInclude Include="..\..\include\polarssl\version.h" />
     <ClInclude Include="..\..\include\polarssl\x509.h" />
+    <ClInclude Include="..\..\include\polarssl\x509write.h" />
     <ClInclude Include="..\..\include\polarssl\xtea.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\library\aes.c" />
     <ClCompile Include="..\..\library\arc4.c" />
     <ClCompile Include="..\..\library\asn1parse.c" />
+    <ClCompile Include="..\..\library\asn1write.c" />
     <ClCompile Include="..\..\library\base64.c" />
     <ClCompile Include="..\..\library\bignum.c" />
     <ClCompile Include="..\..\library\blowfish.c" />
@@ -199,34 +214,46 @@
     <ClCompile Include="..\..\library\debug.c" />
     <ClCompile Include="..\..\library\des.c" />
     <ClCompile Include="..\..\library\dhm.c" />
+    <ClCompile Include="..\..\library\ecdh.c" />
+    <ClCompile Include="..\..\library\ecdsa.c" />
+    <ClCompile Include="..\..\library\ecp.c" />
     <ClCompile Include="..\..\library\entropy.c" />
     <ClCompile Include="..\..\library\entropy_poll.c" />
     <ClCompile Include="..\..\library\error.c" />
     <ClCompile Include="..\..\library\gcm.c" />
     <ClCompile Include="..\..\library\havege.c" />
-    <ClCompile Include="..\..\library\md.c" />
     <ClCompile Include="..\..\library\md2.c" />
     <ClCompile Include="..\..\library\md4.c" />
     <ClCompile Include="..\..\library\md5.c" />
+    <ClCompile Include="..\..\library\md.c" />
     <ClCompile Include="..\..\library\md_wrap.c" />
+    <ClCompile Include="..\..\library\memory_buffer_alloc.c" />
+    <ClCompile Include="..\..\library\memory.c" />
     <ClCompile Include="..\..\library\net.c" />
+    <ClCompile Include="..\..\library\oid.c" />
     <ClCompile Include="..\..\library\padlock.c" />
+    <ClCompile Include="..\..\library\pbkdf2.c" />
     <ClCompile Include="..\..\library\pem.c" />
+    <ClCompile Include="..\..\library\pk.c" />
     <ClCompile Include="..\..\library\pkcs11.c" />
+    <ClCompile Include="..\..\library\pkcs12.c" />
+    <ClCompile Include="..\..\library\pkcs5.c" />
     <ClCompile Include="..\..\library\rsa.c" />
     <ClCompile Include="..\..\library\sha1.c" />
-    <ClCompile Include="..\..\library\sha2.c" />
-    <ClCompile Include="..\..\library\sha4.c" />
+    <ClCompile Include="..\..\library\sha256.c" />
+    <ClCompile Include="..\..\library\sha512.c" />
     <ClCompile Include="..\..\library\ssl_cache.c" />
+    <ClCompile Include="..\..\library\ssl_ciphersuites.c" />
     <ClCompile Include="..\..\library\ssl_cli.c" />
     <ClCompile Include="..\..\library\ssl_srv.c" />
     <ClCompile Include="..\..\library\ssl_tls.c" />
     <ClCompile Include="..\..\library\timing.c" />
     <ClCompile Include="..\..\library\version.c" />
     <ClCompile Include="..\..\library\x509parse.c" />
+    <ClCompile Include="..\..\library\x509write.c" />
     <ClCompile Include="..\..\library\xtea.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/visualc/VS6/polarssl.dsp b/visualc/VS6/polarssl.dsp
index 935300c4b..a808cda1c 100644
--- a/visualc/VS6/polarssl.dsp
+++ b/visualc/VS6/polarssl.dsp
@@ -97,6 +97,10 @@ SOURCE=..\..\library\asn1parse.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\library\asn1write.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\library\base64.c
 # End Source File
 # Begin Source File
@@ -141,6 +145,18 @@ SOURCE=..\..\library\dhm.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\library\ecdh.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\library\ecdsa.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\library\ecp.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\library\entropy.c
 # End Source File
 # Begin Source File
@@ -153,18 +169,14 @@ SOURCE=..\..\library\error.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\library\gcm.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\library\havege.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\library\md.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\library\md_wrap.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\library\md2.c
 # End Source File
 # Begin Source File
@@ -177,18 +189,58 @@ SOURCE=..\..\library\md5.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\library\md.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\library\md_wrap.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\library\memory_buffer_alloc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\library\memory.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\library\net.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\library\oid.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\library\padlock.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\library\pbkdf2.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\library\pem.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\library\pk.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\library\pkcs11.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\library\pkcs12.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\library\pkcs5.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\library\rsa.c
 # End Source File
 # Begin Source File
@@ -197,11 +249,19 @@ SOURCE=..\..\library\sha1.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\library\sha2.c
+SOURCE=..\..\library\sha256.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\library\sha4.c
+SOURCE=..\..\library\sha512.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\library\ssl_cache.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\library\ssl_ciphersuites.c
 # End Source File
 # Begin Source File
 
@@ -221,10 +281,18 @@ SOURCE=..\..\library\timing.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\library\version.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\library\x509parse.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\library\x509write.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\library\xtea.c
 # End Source File
 # End Group
@@ -245,6 +313,10 @@ SOURCE=..\..\include\polarssl\asn1.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\polarssl\asn1write.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\polarssl\base64.h
 # End Source File
 # Begin Source File
@@ -297,6 +369,18 @@ SOURCE=..\..\include\polarssl\dhm.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\polarssl\ecdh.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\polarssl\ecdsa.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\polarssl\ecp.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\polarssl\entropy.h
 # End Source File
 # Begin Source File
@@ -309,18 +393,14 @@ SOURCE=..\..\include\polarssl\error.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\polarssl\gcm.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\polarssl\havege.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\polarssl\md.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\polarssl\md_wrap.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\polarssl\md2.h
 # End Source File
 # Begin Source File
@@ -333,18 +413,58 @@ SOURCE=..\..\include\polarssl\md5.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\polarssl\md.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\polarssl\md_wrap.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\polarssl\memory.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\polarssl\net.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\polarssl\oid.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\polarssl\openssl.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\polarssl\padlock.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\polarssl\pbkdf2.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\polarssl\pem.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\polarssl\pkcs11.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\polarssl\pkcs12.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\polarssl\pkcs5.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\polarssl\pk.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\polarssl\rsa.h
 # End Source File
 # Begin Source File
@@ -353,11 +473,19 @@ SOURCE=..\..\include\polarssl\sha1.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\polarssl\sha2.h
+SOURCE=..\..\include\polarssl\sha256.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\polarssl\sha4.h
+SOURCE=..\..\include\polarssl\sha512.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\polarssl\ssl_cache.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\polarssl\ssl_ciphersuites.h
 # End Source File
 # Begin Source File
 
@@ -369,10 +497,18 @@ SOURCE=..\..\include\polarssl\timing.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\polarssl\version.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\polarssl\x509.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\polarssl\x509write.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\polarssl\xtea.h
 # End Source File
 # End Group