diff --git a/CMakeLists.txt b/CMakeLists.txt
index 577e96c4aab2a16cb150471ed60991ef36c86932..f86c8d0a5d76da21bcb80cd42b33c440ca5af74c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -114,12 +114,12 @@ include(CheckSystem)
 
 # SPM depends on Lapacke and CBLAS
 #---------------------------------
-find_package(CBLAS) # Should be REQUIRED for BLAS sequential only
+find_package(CBLAS REQUIRED)
 if(CBLAS_FOUND)
   include_directories(${CBLAS_INCLUDE_DIRS})
 endif()
 
-find_package(LAPACKE) # Should be also REQUIRED
+find_package(LAPACKE REQUIRED)
 if(LAPACKE_FOUND)
   include_directories(${LAPACKE_INCLUDE_DIRS})
 endif()
diff --git a/cmake_modules/morse_cmake b/cmake_modules/morse_cmake
index 1deddb2781f62dbbf0ee9199f569e49f7346397a..8ddf01ff80d9f9fb87465b75c1bfe083bf4e1849 160000
--- a/cmake_modules/morse_cmake
+++ b/cmake_modules/morse_cmake
@@ -1 +1 @@
-Subproject commit 1deddb2781f62dbbf0ee9199f569e49f7346397a
+Subproject commit 8ddf01ff80d9f9fb87465b75c1bfe083bf4e1849
diff --git a/wrappers/fortran90/CMakeLists.txt b/wrappers/fortran90/CMakeLists.txt
index 439a7beb34e67d1b58bcbb2f5ab6db7616e4a1fb..dd80adc3ae8ba3c1e84ffe8e6242a5335df6732a 100644
--- a/wrappers/fortran90/CMakeLists.txt
+++ b/wrappers/fortran90/CMakeLists.txt
@@ -1,6 +1,6 @@
 ###
 #
-#  @copyright 2017      Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
+#  @copyright 2017-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
 #                       Univ. Bordeaux. All rights reserved.
 #
 #  @version 6.0.0