diff --git a/.gitmodules b/.gitmodules
index 34a18700fda9d005a1fd7b5fa82d897120df89de..ef55f1f2227cf805cb347ee64b160d8df9528fe6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,6 +10,6 @@
 [submodule "submodules/llvm"]
 	path = submodules/llvm
 	url = https://github.com/llvm-mirror/llvm.git
-[submodule "submodules/clang"]
-	path = submodules/clang
+[submodule "submodules/llvm/tools/clang"]
+	path = submodules/llvm/tools/clang
 	url = https://github.com/llvm-mirror/clang.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d37d206e504a68e89f46300121f6461ab571288..599693f66aac6a7cc8323ab3b49a4a9c27509ac7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,9 @@
 cmake_minimum_required(VERSION 2.6)
 project (pyopencl)
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/submodules/pocl/cmake")
+
+set(KERNELLIB_HOST_CPU_VARIANTS "distro")
  
 add_subdirectory(submodules/llvm)
-add_subdirectory(submodules/clang)
 add_subdirectory(submodules/pocl)
diff --git a/submodules/llvm b/submodules/llvm
deleted file mode 160000
index 1f44212e7e440274e13aabf36a53b1d2df013fe7..0000000000000000000000000000000000000000
--- a/submodules/llvm
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1f44212e7e440274e13aabf36a53b1d2df013fe7
diff --git a/submodules/clang b/submodules/llvm/tools/clang
similarity index 100%
rename from submodules/clang
rename to submodules/llvm/tools/clang