diff --git a/CMakeLists.txt b/CMakeLists.txt
index d1f4c7a64e63a4cdf51e8b11275bf763c2fb4792..a31ad3080bcf078cd8d22e85838f3ad41306efa3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,17 +64,17 @@ INCLUDE_DIRECTORIES("submods/plink-ng/2.0")
 if(WIN32)
     set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
 else()
-    set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+	set(CMAKE_FIND_LIBRARY_SUFFIXES ".a" ".so")
 endif()
 
-find_library(lib_blas64 NAMES kblas PATHS "${KMLROOT}/lib/kblas/nolocking" "${KMLROOT}/lib")
-find_library(lib_lapack64 NAMES klapcak PATHS "${KMLROOT}/lib/intel64" "${KMLROOT}/lib")
+find_library(lib_blas64 NAMES kblas PATHS "${KMLROOT}/lib/single" "${KMLROOT}/lib")
+find_library(lib_lapack64 NAMES klapack PATHS "${KMLROOT}/lib/intel64" "${KMLROOT}/lib")
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR APPLE)
     find_library(lib_thread NAMES openmp PATHS "${KMLROOT}/lib/intel64" "${KMLROOT}/lib")
 else()
     find_library(lib_thread NAMES pthread PATHS "${KMLROOT}/lib/intel64" "${KMLROOT}/lib")
 endif()
-set(KML_LIB ${lib_lp64} ${lib_lp64} ${lib_thread})
+set(KML_LIB ${lib_blas64} ${lib_lapack64} ${lib_thread})
 
 IF(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE RELEASE)