diff --git a/.gitmodules b/.gitmodules
index 4603288e09a..4de71053c47 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,10 @@
 [submodule "Externals/luajit"]
 	path = Externals/luajit
 	url = https://github.com/q4a/LuaJIT.git
+	branch = xray
 [submodule "Externals/luabind"]
 	path = Externals/luabind
-	url = https://github.com/Xottab-DUTY/luabind-deboostified.git
+	url = https://github.com/q4a/luabind-deboostified.git
 	branch = xray
 [submodule "Externals/GameSpy"]
 	path = Externals/GameSpy
diff --git a/Externals/luabind b/Externals/luabind
index ee8a074be60..933e2174232 160000
--- a/Externals/luabind
+++ b/Externals/luabind
@@ -1 +1 @@
-Subproject commit ee8a074be60ab849b2f4c7bba79b8c6001bf74c3
+Subproject commit 933e21742327a2ad7bffd77b901a5a7bd06d9fd7
diff --git a/doc/howto/build-linux.txt b/doc/howto/build-linux.txt
index dc20c45a9ed..4af2bdce2a2 100644
--- a/doc/howto/build-linux.txt
+++ b/doc/howto/build-linux.txt
@@ -19,6 +19,7 @@ cd xray-16
 git submodule update --init --recursive
 mkdir bin && cd bin
 cmake ..
+(or export CC=clang && export CXX=clang++ && cmake ..)
 make