diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
index 16f4b29dcceef..de785b13d067d 100644
--- a/src/bootstrap/doc.rs
+++ b/src/bootstrap/doc.rs
@@ -272,6 +272,12 @@ impl Step for TheBook {
             name: INTERNER.intern_string(format!("{}/second-edition", name)),
         });
 
+        // build book 2018 edition
+        builder.ensure(Rustbook {
+            target,
+            name: INTERNER.intern_string(format!("{}/2018-edition", name)),
+        });
+
         // build the version info page and CSS
         builder.ensure(Standalone {
             compiler,
diff --git a/src/doc/book b/src/doc/book
index f51127530d46b..36d65d00164d1 160000
--- a/src/doc/book
+++ b/src/doc/book
@@ -1 +1 @@
-Subproject commit f51127530d46b9acbf4747c859da185e771cfcf3
+Subproject commit 36d65d00164d1750f6fa7f8b0f52dabc3fea500b