diff --git a/.gitmodules b/.gitmodules
index 96b1eab7..f763b22c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,9 @@
 [submodule "format-benchmark"]
 	path = format-benchmark
 	url = git://github.com/vitaut/format-benchmark.git
-[submodule "breathe"]
-	path = breathe
+[submodule "doc/breathe"]
+	path = doc/breathe
 	url = git://github.com/vitaut/breathe.git
+[submodule "doc/sphinx"]
+	path = doc/sphinx
+	url = git@github.com:cppformat/sphinx.git
diff --git a/breathe b/breathe
deleted file mode 160000
index 681c69c7..00000000
--- a/breathe
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 681c69c79efbf426eecbf9f2ed9e2b95f7a97723
diff --git a/doc/sphinx b/doc/sphinx
new file mode 160000
index 00000000..aab44c9f
--- /dev/null
+++ b/doc/sphinx
@@ -0,0 +1 @@
+Subproject commit aab44c9f1f42d93ab7cb38e1a31b3ea5b42dd274