diff --git a/.gitmodules b/.gitmodules
index 6b2714edd4d..4a136cff1cd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -65,3 +65,6 @@
 [submodule "src/doc/rustc-guide"]
 	path = src/doc/rustc-guide
 	url = https://github.com/rust-lang/rustc-guide.git
+[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 f9b19ffb10d..18a2b950e59 100644
--- a/src/bootstrap/doc.rs
+++ b/src/bootstrap/doc.rs
@@ -70,6 +70,7 @@ fn run(self, builder: &Builder) {
 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 00000000000..ad895867b67
--- /dev/null
+++ b/src/doc/edition-guide
@@ -0,0 +1 @@
+Subproject commit ad895867b675199a7f597ce7045a56875a7e516a