diff --git a/USAGE.md b/USAGE.md
index b5478e70..68ae5e2e 100644
--- a/USAGE.md
+++ b/USAGE.md
@@ -265,6 +265,8 @@ name: Daniel S. Himmelstein  # mandatory
 initials: DSH  # optional
 orcid: 0000-0002-3012-7446  # mandatory
 twitter: dhimmel  # optional
+mastodon: dhimmel  # optional: mastodon username
+mastodon-server: genomic.social  # optional: mastodon server (instance)
 email: daniel.himmelstein@gmail.com  # suggested
 corresponding: true  # optional, if set to true displays author's email for correspondence
 affiliations:  # as a list, strongly suggested
diff --git a/content/00.front-matter.md b/content/00.front-matter.md
index 1f6ac0e4..720a3df5 100644
--- a/content/00.front-matter.md
+++ b/content/00.front-matter.md
@@ -50,6 +50,11 @@ Published: {{manubot.date_long}}
     · ![Twitter icon](images/twitter.svg){.inline_icon width=16 height=16}
     [{{author.twitter}}](https://twitter.com/{{author.twitter}})
   {%- endif %}
+  {%- if author.mastodon is defined and author.mastodon is not none and author["mastodon-server"] is defined and author["mastodon-server"] is not none %}
+    {%- set has_ids = true %}
+    · ![Mastodon icon](images/mastodon.svg){.inline_icon}
+    [\@{{author.mastodon}}@{{author["mastodon-server"]}}](https://{{author["mastodon-server"]}}/@{{author.mastodon}})
+  {%- endif %}
   {%- if has_ids %}
     <br>
   {%- endif %}
diff --git a/content/images/mastodon.svg b/content/images/mastodon.svg
new file mode 100644
index 00000000..da422995
--- /dev/null
+++ b/content/images/mastodon.svg
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="61.076954mm"
+   height="65.47831mm"
+   viewBox="0 0 216.4144 232.00976"
+   version="1.1"
+   id="svg186"
+   sodipodi:docname="mastodon.svg"
+   inkscape:version="1.2.1 (9c6d41e, 2022-07-14)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs190" />
+  <sodipodi:namedview
+     id="namedview188"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="0.95362368"
+     inkscape:cx="46.66411"
+     inkscape:cy="123.73854"
+     inkscape:window-width="1463"
+     inkscape:window-height="456"
+     inkscape:window-x="0"
+     inkscape:window-y="38"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg186" />
+  <path
+     fill="#2b90d9"
+     d="M211.80734 139.0875c-3.18125 16.36625-28.4925 34.2775-57.5625 37.74875-15.15875 1.80875-30.08375 3.47125-45.99875 2.74125-26.0275-1.1925-46.565-6.2125-46.565-6.2125 0 2.53375.15625 4.94625.46875 7.2025 3.38375 25.68625 25.47 27.225 46.39125 27.9425 21.11625.7225 39.91875-5.20625 39.91875-5.20625l.8675 19.09s-14.77 7.93125-41.08125 9.39c-14.50875.7975-32.52375-.365-53.50625-5.91875C9.23234 213.82 1.40609 165.31125.20859 116.09125c-.365-14.61375-.14-28.39375-.14-39.91875 0-50.33 32.97625-65.0825 32.97625-65.0825C49.67234 3.45375 78.20359.2425 107.86484 0h.72875c29.66125.2425 58.21125 3.45375 74.8375 11.09 0 0 32.975 14.7525 32.975 65.0825 0 0 .41375 37.13375-4.59875 62.915"
+     id="path182"
+     style="fill:#7a7a7a" />
+  <path
+     fill="#fff"
+     d="M177.50984 80.077v60.94125h-24.14375v-59.15c0-12.46875-5.24625-18.7975-15.74-18.7975-11.6025 0-17.4175 7.5075-17.4175 22.3525v32.37625H96.20734V85.42325c0-14.845-5.81625-22.3525-17.41875-22.3525-10.49375 0-15.74 6.32875-15.74 18.7975v59.15H38.90484V80.077c0-12.455 3.17125-22.3525 9.54125-29.675 6.56875-7.3225 15.17125-11.07625 25.85-11.07625 12.355 0 21.71125 4.74875 27.8975 14.2475l6.01375 10.08125 6.015-10.08125c6.185-9.49875 15.54125-14.2475 27.8975-14.2475 10.6775 0 19.28 3.75375 25.85 11.07625 6.36875 7.3225 9.54 17.22 9.54 29.675"
+     id="path184" />
+</svg>
diff --git a/content/metadata.yaml b/content/metadata.yaml
index 51801108..ccf8d559 100644
--- a/content/metadata.yaml
+++ b/content/metadata.yaml
@@ -12,6 +12,8 @@ authors:
     initials: JD
     orcid: XXXX-XXXX-XXXX-XXXX
     twitter: johndoe
+    mastodon: johndoe
+    mastodon-server: mastodon.social
     email: john.doe@something.com
     affiliations:
       - Department of Something, University of Whatever