diff --git a/build/jam/repositories/HaikuPorts/x86_gcc2 b/build/jam/repositories/HaikuPorts/x86_gcc2
index ce244326b6..75ccea9cbc 100644
--- a/build/jam/repositories/HaikuPorts/x86_gcc2
+++ b/build/jam/repositories/HaikuPorts/x86_gcc2
@@ -960,9 +960,10 @@ RemotePackageRepository HaikuPorts
 	libzip_x86_devel-0.11.2-1
 	live555_x86-2016.01.29-3
 	live555_x86_devel-2016.01.29-3
-	llvm_x86-3.8.1-1
-	llvm_x86_clang-3.8.1-1
-	llvm_x86_clang_analysis-3.8.1-1
+	llvm_x86-4.0.1-1
+	llvm_x86_clang-4.0.1-1
+	llvm_x86_clang_analysis-4.0.1-1
+	llvm_x86_libs-4.0.1-1
 	lmms_x86-1.2.0_git-1
 	lua_x86-5.2.3-2
 	lua_x86_devel-5.2.3-2
@@ -974,9 +975,9 @@ RemotePackageRepository HaikuPorts
 	lzo_x86-2.09-1
 	lzo_x86_devel-2.09-1
 	marble_x86-1.9.2-1
-	mesa_x86-17.1.1-1
-	mesa_x86_devel-17.1.1-1
-	mesa_x86_swpipe-17.1.1-1
+	mesa_x86-17.1.4-1
+	mesa_x86_devel-17.1.4-1
+	mesa_x86_swpipe-17.1.4-1
 	mosh_x86-1.2.4-2
 	mpc_x86-1.0.3-1
 	mpc_x86_devel-1.0.3-1