diff --git a/0000-template.md b/0000-template.md
index 8801e2e..a2c422e 100644
--- a/0000-template.md
+++ b/0000-template.md
@@ -1,12 +1,13 @@
-*   **RFC:** 0000 (fill in with pull request number)
-*   **Title:** (fill me in with unique name, My Awesome Feature)
+{{#title PGXN RFC–0 — (fill me in with unique title, My Awesome Feature)}}
+*   **RFC:** 0 (fill in with pull request number)
+*   **Title:** (fill me in with title part of {{#title}} above)
 *   **Slug:** (fill me in with a unique slug, `my_awesome_feature`)
 *   **Start Date:** (fill me in with today's date, YYYY-MM-DD)
 *   **Status:** Proposed Standard (May be "Proposed", "Draft", "Standard")
-*   **Pull Request:** [pgxn/rfcs#0000](https://github.com/pgxn/rfcs/pull/0000)
-*   **Implementation Issue:** [pgxn/repo#0000](https://github.com/pgxn/repo/issues/0000)
+*   **Pull Request:** [pgxn/rfcs#0](https://github.com/pgxn/rfcs/pull/0)
+*   **Implementation Issue:** [pgxn/repo#0](https://github.com/pgxn/repo/issues/0)
 
-# RFC--0000 --- [Fill In Title]
+# RFC--0 --- [Fill In Title]
 
 ## Abstract
 
diff --git a/text/0001-meta-spec-v1.md b/text/0001-meta-spec-v1.md
index 8df308d..75be3c1 100644
--- a/text/0001-meta-spec-v1.md
+++ b/text/0001-meta-spec-v1.md
@@ -1,5 +1,6 @@
+{{#title PGXN RFC–1 — Meta Spec v1}}
 *   **RFC:** 1
-*   **Title:** PGXN Meta Spec
+*   **Title:** Meta Spec v1
 *   **Slug:** `meta-spec`
 *   **Start Date:** 2010-08-17
 *   **Status:** Standard