diff --git a/cpp/CHANGELOG.md b/cpp/CHANGELOG.md
index 50e62d7dfc..87fd3ee2f3 100644
--- a/cpp/CHANGELOG.md
+++ b/cpp/CHANGELOG.md
@@ -22,6 +22,7 @@ Please mark all change in change log and use the ticket from JIRA.
 - MS-73 - cmake: delete civetweb
 - MS-65 - Implement GetTableRowCount interface
 - MS-45 - Implement DeleteTable interface
+- MS-75 - cmake: change faiss version to 1.5.2; add CUDA gencode
 
 ## Task
 - MS-74 - Change README.md in cpp
diff --git a/cpp/cmake/DefineOptions.cmake b/cpp/cmake/DefineOptions.cmake
index cc358e7f1e..340e72d847 100644
--- a/cpp/cmake/DefineOptions.cmake
+++ b/cpp/cmake/DefineOptions.cmake
@@ -71,7 +71,7 @@ define_option(MEGASEARCH_WITH_FAISS "Build with FAISS library" ON)
 define_option(MEGASEARCH_WITH_FAISS_GPU_VERSION "Build with FAISS GPU version" ON)
 
 define_option_string(MEGASEARCH_FAISS_GPU_ARCH "Specifying which GPU architectures to build against"
-        "-gencode=arch=compute_61,code=sm_61")
+        "-gencode=arch=compute_35,code=sm_35 -gencode=arch=compute_52,code=sm_52 -gencode=arch=compute_60,code=sm_60 -gencode=arch=compute_61,code=sm_61")
 
 define_option(MEGASEARCH_WITH_LAPACK "Build with LAPACK library" ON)
 
diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake
index 1e3ca0e451..bdb573ca7d 100644
--- a/cpp/cmake/ThirdPartyPackages.cmake
+++ b/cpp/cmake/ThirdPartyPackages.cmake
@@ -220,7 +220,7 @@ endif()
 if(DEFINED ENV{MEGASEARCH_FAISS_URL})
     set(FAISS_SOURCE_URL "$ENV{MEGASEARCH_FAISS_URL}")
 else()
-    set(FAISS_SOURCE_URL "https://github.com/JinHai-CN/faiss/archive/${FAISS_VERSION}.tar.gz")
+    set(FAISS_SOURCE_URL "https://github.com/facebookresearch/faiss/archive/${FAISS_VERSION}.tar.gz")
 endif()
 
 if (DEFINED ENV{MEGASEARCH_GTEST_URL})
diff --git a/cpp/thirdparty/versions.txt b/cpp/thirdparty/versions.txt
index 514703819c..6c290f9d1e 100644
--- a/cpp/thirdparty/versions.txt
+++ b/cpp/thirdparty/versions.txt
@@ -26,7 +26,7 @@
 BOOST_VERSION=1.70.0
 BZIP2_VERSION=1.0.6
 EASYLOGGINGPP_VERSION=v9.96.7
-FAISS_VERSION=master
+FAISS_VERSION=v1.5.2
 GTEST_VERSION=1.8.1
 LAPACK_VERSION=v3.8.0
 LZ4_VERSION=v1.9.1
@@ -49,7 +49,7 @@ DEPENDENCIES=(
   "MEGASEARCH_BOOST_URL boost-${BOOST_VERSION}.tar.gz https://dl.bintray.com/boostorg/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION//./_}.tar.gz"
   "MEGASEARCH_BZIP2_URL bzip2-${BZIP2_VERSION}.tar.gz https://fossies.org/linux/misc/bzip2-${BZIP2_VERSION}.tar.gz"
   "MEGASEARCH_EASYLOGGINGPP_URL easyloggingpp-${EASYLOGGINGPP_VERSION}.tar.gz https://github.com/zuhd-org/easyloggingpp/archive/${EASYLOGGINGPP_VERSION}.tar.gz"
-  "MEGASEARCH_FAISS_URL faiss-${FAISS_VERSION}.tar.gz https://github.com/JinHai-CN/faiss/archive/${FAISS_VERSION}.tar.gz"
+  "MEGASEARCH_FAISS_URL faiss-${FAISS_VERSION}.tar.gz https://github.com/facebookresearch/faiss/archive/${FAISS_VERSION}.tar.gz"
   "MEGASEARCH_GTEST_URL gtest-${GTEST_VERSION}.tar.gz https://github.com/google/googletest/archive/release-${GTEST_VERSION}.tar.gz"
   "MEGASEARCH_LAPACK_URL lapack-${LAPACK_VERSION}.tar.gz https://github.com/Reference-LAPACK/lapack/archive/${LAPACK_VERSION}.tar.gz
   "MEGASEARCH_LZ4_URL lz4-${LZ4_VERSION}.tar.gz https://github.com/lz4/lz4/archive/${LZ4_VERSION}.tar.gz"