diff --git a/VisualStudio/oqs/dll.def b/VisualStudio/oqs/dll.def
index 4dcccffec..17af59a39 100644
--- a/VisualStudio/oqs/dll.def
+++ b/VisualStudio/oqs/dll.def
@@ -19,6 +19,15 @@ EXPORTS
 	OQS_KEM_frodokem_976_cshake_decaps
 	OQS_KEM_frodokem_976_cshake_encaps
 	OQS_KEM_frodokem_976_cshake_keypair
+	OQS_KEM_kyber_512_cca_kem_keypair
+	OQS_KEM_kyber_512_cca_kem_encaps
+	OQS_KEM_kyber_512_cca_kem_decaps
+	OQS_KEM_kyber_768_cca_kem_keypair
+	OQS_KEM_kyber_768_cca_kem_encaps
+	OQS_KEM_kyber_768_cca_kem_decaps
+	OQS_KEM_kyber_1024_cca_kem_keypair
+	OQS_KEM_kyber_1024_cca_kem_encaps
+	OQS_KEM_kyber_1024_cca_kem_decaps
 	OQS_KEM_newhope_1024_cca_kem_decaps
 	OQS_KEM_newhope_1024_cca_kem_encaps
 	OQS_KEM_newhope_1024_cca_kem_keypair
diff --git a/VisualStudio/oqs/oqs.vcxproj b/VisualStudio/oqs/oqs.vcxproj
index 3ed98e303..e36d3d9f1 100644
--- a/VisualStudio/oqs/oqs.vcxproj
+++ b/VisualStudio/oqs/oqs.vcxproj
@@ -36,6 +36,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\kem\frodokem\kem_frodokem.h" />
+    <ClInclude Include="..\..\src\kem\kyber\kem_kyber.h" />
     <ClInclude Include="..\..\src\kem\newhopenist\kem_newhopenist.h" />
     <ClInclude Include="..\..\src\kem\kem.h" />
     <ClInclude Include="..\..\src\kem\sike\kem_sike.h" />
@@ -87,6 +88,10 @@
     <ClCompile Include="..\..\src\kem\frodokem\frodo976_cshake.c" />
     <ClCompile Include="..\..\src\kem\frodokem\kem_frodokem.c" />
     <ClCompile Include="..\..\src\kem\frodokem\util.c" />
+    <ClCompile Include="..\..\src\kem\kyber\kem_kyber.c" />
+    <ClCompile Include="..\..\src\kem\kyber\win_kyber1024.c" />
+    <ClCompile Include="..\..\src\kem\kyber\win_kyber512.c" />
+    <ClCompile Include="..\..\src\kem\kyber\win_kyber768.c" />
     <ClCompile Include="..\..\src\kem\newhopenist\kem_newhopenist.c" />
     <ClCompile Include="..\..\src\kem\kem.c" />
     <ClCompile Include="..\..\src\kem\newhopenist\win_newhope1024cca.c" />
diff --git a/VisualStudio/oqs/oqs.vcxproj.filters b/VisualStudio/oqs/oqs.vcxproj.filters
index 59546d744..d38bdce45 100644
--- a/VisualStudio/oqs/oqs.vcxproj.filters
+++ b/VisualStudio/oqs/oqs.vcxproj.filters
@@ -121,6 +121,18 @@
     <ClCompile Include="..\..\src\kem\newhopenist\win_newhope1024cca.c">
       <Filter>newhopenist</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\kem\kyber\kem_kyber.c">
+      <Filter>kyber</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kem\kyber\win_kyber512.c">
+      <Filter>kyber</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kem\kyber\win_kyber768.c">
+      <Filter>kyber</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kem\kyber\win_kyber1024.c">
+      <Filter>kyber</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\oqs.h" />
@@ -230,6 +242,9 @@
     <ClInclude Include="..\..\src\kem\newhopenist\kem_newhopenist.h">
       <Filter>newhopenist</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\kem\kyber\kem_kyber.h">
+      <Filter>kyber</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="dll.def" />
@@ -259,5 +274,8 @@
     <Filter Include="newhopenist">
       <UniqueIdentifier>{cb72ff2d-77c6-4e60-a04e-6aad5fc6c328}</UniqueIdentifier>
     </Filter>
+    <Filter Include="kyber">
+      <UniqueIdentifier>{17171b11-2a2c-4084-a710-c555295e2484}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/VisualStudio/winconfig.h b/VisualStudio/winconfig.h
index 472ba2e49..b6e6a4269 100644
--- a/VisualStudio/winconfig.h
+++ b/VisualStudio/winconfig.h
@@ -6,12 +6,15 @@
 #define OQS_ENABLE_KEM_frodokem_976_aes
 #define OQS_ENABLE_KEM_frodokem_640_cshake
 #define OQS_ENABLE_KEM_frodokem_976_cshake
+#define OQS_ENABLE_KEM_kyber_512_cca_kem
+#define OQS_ENABLE_KEM_kyber_768_cca_kem
+#define OQS_ENABLE_KEM_kyber_1024_cca_kem
+#define OQS_ENABLE_KEM_newhope_1024_cca_kem
+#define OQS_ENABLE_KEM_newhope_512_cca_kem
 #define OQS_ENABLE_KEM_sike_p503
 #define OQS_ENABLE_KEM_sike_p751
 #define OQS_ENABLE_KEM_sidh_p503
 #define OQS_ENABLE_KEM_sidh_p751
-#define OQS_ENABLE_KEM_newhope_1024_cca_kem
-#define OQS_ENABLE_KEM_newhope_512_cca_kem
 #define OQS_ENABLE_SIG_picnic_L1_FS
 #define OQS_ENABLE_SIG_picnic_L1_UR
 #define OQS_ENABLE_SIG_picnic_L3_FS
diff --git a/src/kem/kyber/ref/indcpa.c b/src/kem/kyber/ref/indcpa.c
index f72b74700..6e43e1cbe 100644
--- a/src/kem/kyber/ref/indcpa.c
+++ b/src/kem/kyber/ref/indcpa.c
@@ -119,7 +119,7 @@ static void gen_matrix(polyvec *a, const unsigned char *seed, int transposed) //
 	uint16_t val;
 	unsigned int nblocks;
 	const unsigned int maxnblocks = 4;
-	uint8_t buf[OQS_SHA3_SHAKE128_RATE * maxnblocks];
+	uint8_t buf[OQS_SHA3_SHAKE128_RATE * 4]; /* was '* maxnblocks' but this is not a contant expr on WIN32 */
 	int i, j, k;
 	uint64_t state[25]; // SHAKE state
 	unsigned char extseed[KYBER_SYMBYTES + 2];