diff --git a/Cargo.lock b/Cargo.lock
index 73ffd3e044eb3..a7496e61b8beb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -152,7 +152,9 @@ dependencies = [
  "nom",
  "proc-macro2",
  "quote",
+ "serde",
  "syn",
+ "toml",
 ]
 
 [[package]]
diff --git a/src/librustdoc/Cargo.toml b/src/librustdoc/Cargo.toml
index ccb844cd10b25..67d167e86df7f 100644
--- a/src/librustdoc/Cargo.toml
+++ b/src/librustdoc/Cargo.toml
@@ -8,7 +8,7 @@ path = "lib.rs"
 
 [dependencies]
 arrayvec = { version = "0.7", default-features = false }
-askama = { version = "0.11", default-features = false }
+askama = { version = "0.11", default-features = false, features = ["config"] }
 atty = "0.2"
 pulldown-cmark = { version = "0.9", default-features = false }
 minifier = "0.0.41"
diff --git a/src/librustdoc/askama.toml b/src/librustdoc/askama.toml
new file mode 100644
index 0000000000000..0c984f637ba29
--- /dev/null
+++ b/src/librustdoc/askama.toml
@@ -0,0 +1,2 @@
+[general]
+dirs = ["html/templates"]
diff --git a/src/librustdoc/templates/STYLE.md b/src/librustdoc/html/templates/STYLE.md
similarity index 100%
rename from src/librustdoc/templates/STYLE.md
rename to src/librustdoc/html/templates/STYLE.md
diff --git a/src/librustdoc/templates/page.html b/src/librustdoc/html/templates/page.html
similarity index 100%
rename from src/librustdoc/templates/page.html
rename to src/librustdoc/html/templates/page.html
diff --git a/src/librustdoc/templates/print_item.html b/src/librustdoc/html/templates/print_item.html
similarity index 100%
rename from src/librustdoc/templates/print_item.html
rename to src/librustdoc/html/templates/print_item.html