diff --git a/cmake/FindOpenCL.cmake b/cmake/FindOpenCL.cmake
index c08517f..5709bf4 100644
--- a/cmake/FindOpenCL.cmake
+++ b/cmake/FindOpenCL.cmake
@@ -62,6 +62,10 @@ ELSE (APPLE)
             # Unix style platforms
             FIND_LIBRARY(OPENCL_LIBRARIES OpenCL
               ENV LD_LIBRARY_PATH
+			  "/usr/lib/nvidia-current"
+			  "/usr/lib/beignet"
+			  "/usr/lib/x86_64-linux-gnu"
+			  "/usr/lib/x86-linux-gnu"
             )
 
             GET_FILENAME_COMPONENT(OPENCL_LIB_DIR ${OPENCL_LIBRARIES} PATH)
@@ -70,8 +74,16 @@ ELSE (APPLE)
             # The AMD SDK currently does not place its headers
             # in /usr/include, therefore also search relative
             # to the library
-            FIND_PATH(OPENCL_INCLUDE_DIRS CL/cl.h PATHS ${_OPENCL_INC_CAND} "/usr/local/cuda/include")
-            FIND_PATH(_OPENCL_CPP_INCLUDE_DIRS CL/cl.hpp PATHS ${_OPENCL_INC_CAND} "/usr/local/cuda/include")
+            FIND_PATH(OPENCL_INCLUDE_DIRS CL/cl.h PATHS 
+				${_OPENCL_INC_CAND} 
+				"/usr/local/cuda/include" 
+				"/usr/include/nvidia-current"
+			)
+            FIND_PATH(_OPENCL_CPP_INCLUDE_DIRS CL/cl.hpp PATHS 
+				${_OPENCL_INC_CAND} 
+				"/usr/local/cuda/include" 
+				"/usr/include/nvidia-current"
+			)
 
     ENDIF (WIN32)