diff --git a/pelicanconf.py b/pelicanconf.py
index af862ce..283c779 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -54,7 +54,7 @@
 CODE_PAGE = 'https://github.com/poliastro/poliastro'
 ARCHIVES_PAGE = 'archives.html'
 ABOUT_PAGE = 'pages/about-poliastro.html'
-TWITTER_USERNAME = 'poliastro_py'
+MASTODON_URL = 'https://fosstodon.org/@poliastro'
 GITHUB_USERNAME = 'poliastro'
 SHOW_ARCHIVES = True
 SHOW_FEED = False  # Need to address large feeds
diff --git a/theme/templates/about.html b/theme/templates/about.html
index e807303..bbe4f7e 100644
--- a/theme/templates/about.html
+++ b/theme/templates/about.html
@@ -19,8 +19,8 @@ <h1>{{ page.title }}</h1>
 	      {% if AUTHOR_CV %}
 	      <li><a href="{{ AUTHOR_CV }}" rel="me">CV</a></li>
 	      {% endif %}
-	      {% if TWITTER_USERNAME %}
-	      <li><a class="nodec icon-twitter" href="http://twitter.com/{{ TWITTER_USERNAME }}" rel="me"></a></li>
+	      {% if MASTODON_URL %}
+	      <li><a class="nodec icon-mastodon" href="{{ MASTODON_URL }}" rel="me"></a></li>
               {% endif %}
               {% if GITHUB_USERNAME %}
 	      <li><a class="nodec icon-github" href="http://github.com/{{ GITHUB_USERNAME }}" rel="me"></a></li>
diff --git a/theme/templates/base.html b/theme/templates/base.html
index 681f36f..a49d2c0 100644
--- a/theme/templates/base.html
+++ b/theme/templates/base.html
@@ -75,9 +75,9 @@
                             <li><a class="icon-github" href="{{ CODE_PAGE }}" title="Code">Source Code</a></li>
                         {% endif %}
 
-                        <!--- TWITTER LINK -->
-                        {% if TWITTER_USERNAME %}
-                            <li><a class="icon-twitter" href="http://twitter.com/{{ TWITTER_USERNAME }}" title="Twitter">Twitter</a></li>
+                        <!--- MASTODON LINK -->
+                        {% if MASTODON_URL %}
+                            <li><a class="icon-mastodon" href="{{ MASTODON_URL }}" title="Mastodon">Mastodon</a></li>
                         {% endif %}
 
                         <!--- BLOG PAGE -->