diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32ab7f05d6..6c7377aa40 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,14 +95,6 @@ include_directories("${SPICE_ROOT_DIR}/include")
 add_subdirectory(${SPICE_ROOT_DIR})
 set(DEPENDENT_LIBS ${DEPENDENT_LIBS} Spice)
 
-# OpenCL
-find_package(OpenCL)
-if(OPENCL_FOUND)
-    add_definitions(-DGHL_OPENCL)
-    include_directories(${OPENCL_INCLUDE_DIRS})
-    set(GHOUL_DEPENDENCIES ${GHOUL_DEPENDENCIES} ${OPENCL_LIBRARIES})
-endif(OPENCL_FOUND)
-
 # Kameleon
 option(KAMELEON_LIBRARY_ONLY "Build with Kameleon as library only" ON)
 if(WIN32)
diff --git a/ext/ghoul b/ext/ghoul
index 213ec8a4cd..7d126639c6 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 213ec8a4cd1afe0b497675a17859349a4096761d
+Subproject commit 7d126639c644e42cedbb81946d770d6cc03723af