diff --git a/static/social-icons/mastodon.svg b/static/social-icons/mastodon.svg
new file mode 100644
index 00000000000..bee87ccf44b
--- /dev/null
+++ b/static/social-icons/mastodon.svg
@@ -0,0 +1,9 @@
+
+
+
diff --git a/templates/components/social-icons.html b/templates/components/social-icons.html
index 7be8f33d166..fd75dd30d49 100644
--- a/templates/components/social-icons.html
+++ b/templates/components/social-icons.html
@@ -23,6 +23,10 @@
{{- else if eq .property (uri "http://www.wikidata.org/entity/P2003") -}}{{/* Instagram */}}
{{- $preview_count = add1 $preview_count -}}
+ {{- else if eq .property (uri "http://www.wikidata.org/entity/P4033") -}}{{/* Mastodon */}}
+ {{- $preview_count = add1 $preview_count -}}
+ 
+
{{- end -}}
{{- end -}}
{{- if ne (sub (len $socialAccounts) $preview_count) 0 -}}
diff --git a/templates/org.html b/templates/org.html
index 23061dba3c9..20391c6a594 100644
--- a/templates/org.html
+++ b/templates/org.html
@@ -219,6 +219,7 @@ Platforms and accounts
P2037: ['Github', 'https://github.com/'],
P4015: ['Vimeo', 'https://vimeo.com/'],
P3267: ['Flickr', 'https://www.flickr.com/photos/'],
+ P4033: ['Mastodon', 'https://fedirect.toolforge.org/?id='],
};
const propKeys = Object.keys(props);