diff --git a/.gitmodules b/.gitmodules
index dfd9ee451..9c741c0bf 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,6 +4,6 @@
 [submodule "deps/depot_tools"]
 	path = deps/depot_tools
 	url = https://chromium.googlesource.com/chromium/tools/depot_tools.git
-[submodule "src/modules/keydb_modstatsd/cpp-statsd-client"]
-	path = src/modules/keydb_modstatsd/cpp-statsd-client
+[submodule "deps/cpp-statsd-client"]
+	path = deps/cpp-statsd-client
 	url = https://github.com/vthiery/cpp-statsd-client.git
diff --git a/deps/cpp-statsd-client b/deps/cpp-statsd-client
new file mode 160000
index 000000000..b60bc7bb9
--- /dev/null
+++ b/deps/cpp-statsd-client
@@ -0,0 +1 @@
+Subproject commit b60bc7bb930df664b4ab9573ad8bee80d29dc72d
diff --git a/src/modules/keydb_modstatsd/cpp-statsd-client b/src/modules/keydb_modstatsd/cpp-statsd-client
deleted file mode 160000
index a06a5b935..000000000
--- a/src/modules/keydb_modstatsd/cpp-statsd-client
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a06a5b9359f31d946fe163b9038586982971ae49