diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15a48d9..349201e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,8 +48,8 @@ message(STATUS "CMAKE_CXX_COMPILER: " ${CMAKE_CXX_COMPILER})
 message(STATUS "CMAKE_CXX_COMPILER: " ${CMAKE_CXX_COMPILER_ID})
 
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.4)
-        message(FATAL_ERROR "GCC version 5.4 or higher required")    
+    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0) # Because of GCC bug 48891
+        message(FATAL_ERROR "GCC version 6.0 or higher required")    
     endif()
 endif()
 
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index e875faa..9b67f11 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -4,13 +4,7 @@
 
 #----------------------Find CUDA-----------------------------------------------#
 
-find_package(CUDA)
-if (NOT CUDA_FOUND)
-    # find_package(CUDA REQUIRED) gives a confusing error message if it fails,
-    # therefore we print the reason here explicitly
-    message(FATAL_ERROR "CUDA not found")
-endif()
-
+find_package(CUDA 9 REQUIRED)
 
 #----------------------CUDA settings-------------------------------------------#