diff --git a/src/pages/404.mdx b/src/pages/404.mdx
index 40d01d81..278a076e 100644
--- a/src/pages/404.mdx
+++ b/src/pages/404.mdx
@@ -2,6 +2,30 @@
 title: Page not found
 ---
 
+import AboutMe from "~/components/AboutMe.astro";
+import DailyEmailForm from "~/components/DailyEmailForm.astro";
 import Layout from "~/layouts/PageLayout.astro";
 
-<Layout title={frontmatter.title} />
+<Layout title={frontmatter.title}>
+  Perhaps you were looking for one of these pages:
+
+  - [Products and services](/pricing)
+  - [Public speaking and workshops](/talks)
+  - [My daily email list](/daily)
+  - [The Beyond Blocks podcast](/podcast)
+
+  <div class="mt-8 space-y-8">
+    <aside>
+      ## Join my Daily Email List
+
+      <DailyEmailForm
+        intro="Sign up and get daily emails about Drupal, PHP and software development."
+        testimonials={["adam-nutall"]}
+      />
+    </aside>
+
+    <aside>
+      <AboutMe />
+    </aside>
+  </div>
+</Layout>
diff --git a/src/pages/daily.mdx b/src/pages/daily.mdx
index a94d076e..b619fe8e 100644
--- a/src/pages/daily.mdx
+++ b/src/pages/daily.mdx
@@ -1,6 +1,6 @@
 ---
 layout: ~/layouts/PageLayout.astro
-title: Oliver's Daily List
+title: Oliver's Daily Email List
 testimonials:
   - alexander-carr
   - adam-nuttall