diff --git a/.eleventy.js b/.eleventy.js
index 3bce290750..b913246ac9 100644
--- a/.eleventy.js
+++ b/.eleventy.js
@@ -225,6 +225,11 @@ module.exports = function (eleventyConfig) {
     return response.data.replace("<svg", `<svg focusable="false" role="presentation"`);
   });
 
+  eleventyConfig.addShortcode("mastodonHandleUrl", handle => {
+    const [user, server] = handle.split("@").filter(Boolean);
+    return `https://${server}/@${user}`;
+  });
+
   eleventyConfig.setServerOptions({
     watch: ["./dist/assets/css/*.css", "./dist/assets/js/*.js"],
   });
diff --git a/src/authors/zeppelin.md b/src/authors/zeppelin.md
index a13f42c344..74ca7469d3 100644
--- a/src/authors/zeppelin.md
+++ b/src/authors/zeppelin.md
@@ -1,7 +1,7 @@
 ---
 name: "Gabor Babicz"
 github: zeppelin
-twitter: xeppelin
+mastodon: "@gabor@babicz.social"
 linkedin: xeppelin
 bio: "Senior Software Engineer"
 ---
diff --git a/src/components/author-socials.njk b/src/components/author-socials.njk
index b05538ec3f..8ce43983fd 100644
--- a/src/components/author-socials.njk
+++ b/src/components/author-socials.njk
@@ -21,6 +21,14 @@
           </a>
         </li>
       {% endif %}
+      {% if author.data.mastodon %}
+        <li>
+          <a class="author-socials__icon" href="{% mastodonHandleUrl author.data.mastodon %}">
+            {% include 'svg/social-mastodon.njk' %}
+            <span class="screenreader">{{ author.data.mastodon }} on Mastodon</span>
+          </a>
+        </li>
+      {% endif %}
     </ul>
   {% endif %}
 {%- endmacro -%}