diff --git a/.gitmodules b/.gitmodules
index 038237aa179a9..8287873081d22 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -64,4 +64,6 @@
 	path = src/tools/clang
 	url = https://github.com/rust-lang-nursery/clang.git
 	branch = rust-release-80-v1
-  
\ No newline at end of file
+[submodule "src/doc/edition-guide"]
+	path = src/doc/edition-guide
+	url = https://github.com/rust-lang-nursery/edition-guide
diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
index cb3b61792bf87..85767936fcf14 100644
--- a/src/bootstrap/doc.rs
+++ b/src/bootstrap/doc.rs
@@ -70,6 +70,7 @@ macro_rules! book {
 book!(
     Nomicon, "src/doc/nomicon", "nomicon";
     Reference, "src/doc/reference", "reference";
+    EditionGuide, "src/doc/edition-guide", "edition-guide";
     RustdocBook, "src/doc/rustdoc", "rustdoc";
     RustcBook, "src/doc/rustc", "rustc";
     RustByExample, "src/doc/rust-by-example", "rust-by-example";
diff --git a/src/doc/edition-guide b/src/doc/edition-guide
new file mode 160000
index 0000000000000..ad895867b6751
--- /dev/null
+++ b/src/doc/edition-guide
@@ -0,0 +1 @@
+Subproject commit ad895867b675199a7f597ce7045a56875a7e516a
diff --git a/src/doc/nomicon b/src/doc/nomicon
index fb3e2ac7bf52c..aa1baade8a075 160000
--- a/src/doc/nomicon
+++ b/src/doc/nomicon
@@ -1 +1 @@
-Subproject commit fb3e2ac7bf52c127a06ea02fd7673d2617c4272a
+Subproject commit aa1baade8a0753fbfc08dcd3d373cf5ed6f93f8e