diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5aca946..8c9d3b46 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,8 @@ Changelog
 
 UNRELEASED - 2020-04-20
 -----------------------
-- :wrench: [`xxxxxxxxxxxx`](https://github.com/casey/intermodal/commits/master) Make `publish-check` recipe stricter - _Casey Rodarmor <casey@rodarmor.com>_
+- :books: [`xxxxxxxxxxxx`](https://github.com/casey/intermodal/commits/master) Improve FAQ template - _Casey Rodarmor <casey@rodarmor.com>_
+- :wrench: [`1380290eb8e2`](https://github.com/casey/intermodal/commit/1380290eb8e222605f368bc8346a1e63c83d9af7) Make `publish-check` recipe stricter - _Casey Rodarmor <casey@rodarmor.com>_
 
 
 [v0.1.6](https://github.com/casey/intermodal/releases/tag/v0.1.6) - 2020-04-20
diff --git a/bin/gen/templates/faq.md b/bin/gen/templates/faq.md
index f5d27c69..be2a4f9d 100644
--- a/bin/gen/templates/faq.md
+++ b/bin/gen/templates/faq.md
@@ -6,8 +6,8 @@ FAQ
 {% endfor %}
 
 {% for entry in entries %}
-<h2 name="{{entry.anchor}}">
-{{entry.title}}
+<a name="{{entry.anchor}}"></a>
+## {{entry.title}}
 </h2>
 
 {{entry.text}}
diff --git a/book/src/faq.md b/book/src/faq.md
index ddbae274..21508839 100644
--- a/book/src/faq.md
+++ b/book/src/faq.md
@@ -6,8 +6,8 @@ FAQ
 
 
 
-<h2 name="fzf-preview">
-Can intermodal be used to preview torrents with `fzf`?
+<a name="fzf-preview"></a>
+## Can intermodal be used to preview torrents with `fzf`?
 </h2>
 
 Yes! [@mustaqimM](https://github.com/mustaqimM) came up with the following: