diff --git a/layout/base.j2 b/layout/base.j2
index 2e543f3..e9c200a 100644
--- a/layout/base.j2
+++ b/layout/base.j2
@@ -97,7 +97,7 @@
 			<ul class="tags footer">
 
 			<li><a href="{{ content_url('/atom.xml') }}">Atom Feed</a></li>
-			<li class="contact"><a href="https://twitter.com/{{ site.context.tweet_via }}">Twitter</a></li>
+			<li class="contact">Mastodon: <a rel="me" href="https://{{ site.context.mastodon_domain }}/@{{ site.context.mastodon_user }}">@{{ site.context.mastodon_user }}@{{ site.context.mastodon_domain }}</a></li>
 
 			</ul>
 
diff --git a/layout/frontpage.j2 b/layout/frontpage.j2
index 7da695d..bcbb661 100644
--- a/layout/frontpage.j2
+++ b/layout/frontpage.j2
@@ -33,6 +33,4 @@
 
 {% block copyright %}
 Copyright © {{ time_now|date_format("%Y") }} John-Mark Gurney
-<br>
-Also on <a rel="me" href="https://flyovercountry.social/@encthenet">Mastodon</a>
 {% endblock %}
diff --git a/site.yaml b/site.yaml
index 7b273f9..77f3773 100644
--- a/site.yaml
+++ b/site.yaml
@@ -15,6 +15,8 @@ context:
         scheme_host: https://blogtest.funkthat.com
         viewport: width=device-width, initial-scale=1
         tweet_via: encthenet
+        mastodon_user: encthenet
+        mastodon_domain: flyovercountry.social
         title: encthenet ramblings
 jinja2:
     extensions: