diff --git a/visualc/VS2010/PolarSSL.vcxproj b/visualc/VS2010/PolarSSL.vcxproj
index d1adc0f..d7854ae 100644
--- a/visualc/VS2010/PolarSSL.vcxproj
+++ b/visualc/VS2010/PolarSSL.vcxproj
@@ -194,8 +194,10 @@
     <ClInclude Include="..\..\include\polarssl\ssl.h" />
     <ClInclude Include="..\..\include\polarssl\timing.h" />
     <ClInclude Include="..\..\include\polarssl\version.h" />
+    <ClInclude Include="..\..\include\polarssl\x509_crl.h" />
+    <ClInclude Include="..\..\include\polarssl\x509_crt.h" />
+    <ClInclude Include="..\..\include\polarssl\x509_csr.h" />
     <ClInclude Include="..\..\include\polarssl\x509.h" />
-    <ClInclude Include="..\..\include\polarssl\x509write.h" />
     <ClInclude Include="..\..\include\polarssl\xtea.h" />
   </ItemGroup>
   <ItemGroup>
@@ -238,6 +240,9 @@
     <ClCompile Include="..\..\library\pkcs11.c" />
     <ClCompile Include="..\..\library\pkcs12.c" />
     <ClCompile Include="..\..\library\pkcs5.c" />
+    <ClCompile Include="..\..\library\pkparse.c" />
+    <ClCompile Include="..\..\library\pk_wrap.c" />
+    <ClCompile Include="..\..\library\pkwrite.c" />
     <ClCompile Include="..\..\library\rsa.c" />
     <ClCompile Include="..\..\library\sha1.c" />
     <ClCompile Include="..\..\library\sha256.c" />
@@ -249,8 +254,13 @@
     <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\x509.c" />
+    <ClCompile Include="..\..\library\x509_create.c" />
+    <ClCompile Include="..\..\library\x509_crl.c" />
+    <ClCompile Include="..\..\library\x509_crt.c" />
+    <ClCompile Include="..\..\library\x509_csr.c" />
+    <ClCompile Include="..\..\library\x509write_crt.c" />
+    <ClCompile Include="..\..\library\x509write_csr.c" />
     <ClCompile Include="..\..\library\xtea.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/visualc/VS6/polarssl.dsp b/visualc/VS6/polarssl.dsp
index a808cda..35025a2 100644
--- a/visualc/VS6/polarssl.dsp
+++ b/visualc/VS6/polarssl.dsp
@@ -241,6 +241,18 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\library\pkparse.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\library\pk_wrap.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\library\pkwrite.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\library\rsa.c
 # End Source File
 # Begin Source File
@@ -285,11 +297,35 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\library\x509parse.c
+SOURCE=..\..\library\x509.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\library\x509write.c
+SOURCE=..\..\library\x509_create.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\library\x509_create.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\library\x509_crl.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\library\x509_crt.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\library\x509_csr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\library\x509write_crt.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\library\x509write_csr.c
 # End Source File
 # Begin Source File
 
@@ -501,11 +537,19 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\polarssl\x509.h
+SOURCE=..\..\include\polarssl\x509_crl.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\polarssl\x509write.h
+SOURCE=..\..\include\polarssl\x509_crt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\polarssl\x509_csr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\polarssl\x509.h
 # End Source File
 # Begin Source File