diff --git a/.gitmodules b/.gitmodules
index 8617643a12029..071a11d3a6d6b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,8 +4,9 @@
 	shallow = true
 [submodule "src/tools/cargo"]
 	path = src/tools/cargo
-	url = https://github.com/rust-lang/cargo.git
+	url = https://github.com/ranger-ross/cargo.git
 	shallow = true
+	branch = ff-build-dir-layout
 [submodule "src/doc/reference"]
 	path = src/doc/reference
 	url = https://github.com/rust-lang/reference.git
diff --git a/src/tools/cargo b/src/tools/cargo
index 2c283a9a5c596..37844f0809359 160000
--- a/src/tools/cargo
+++ b/src/tools/cargo
@@ -1 +1 @@
-Subproject commit 2c283a9a5c5968eeb9a8f12313f04feb1ff8dfac
+Subproject commit 37844f08093592cd85de61fbfa1bb47ee7dff1fd