diff --git a/README.md b/README.md
index e282f11c..637156c2 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@
 ![Rambox](https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/screenshots/mac.png)
 
 
-## Services available - 84
+## Services available - 85
 
 <img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/whatsapp.png" alt="WhatsApp" title="WhatsApp">
 <img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/messenger.png" alt="Messenger" title="Messenger">
@@ -127,6 +127,7 @@
 <img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/hibox.png" alt="Hibox" title="Hibox">
 <img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/jandi.png" alt="Jandi" title="Jandi">
 <img width="80" align="left" src="https://raw.githubusercontent.com/saenzramiro/rambox/master/resources/icons/threema.png" alt="Threema" title="Threema">
+<img width="80" align="left" src="resources/icons/mastodon.png" alt="Mastodon" title="Mastodon">
 
 <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
 
diff --git a/app/store/ServicesList.js b/app/store/ServicesList.js
index 3685b686..fcee4644 100644
--- a/app/store/ServicesList.js
+++ b/app/store/ServicesList.js
@@ -762,6 +762,16 @@ Ext.define('Rambox.store.ServicesList', {
 			,description: 'Jandi is a group-oriented enterprise messaging platform with an integrated suite of collaboration tools for workplace.'
 			,url: 'https://___.jandi.com/'
 			,type: 'messaging'
-    		}
+    		},
+
+		    {
+			 id: 'mastodon'
+			,logo: 'mastodon.png'
+			,name: 'Mastodon'
+			,description: 'Mastodon is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication'
+			,url: '___'
+			,type: 'messaging'
+			,note: 'To enable desktop notifications, you have to go to Options inside Mastodon.'
+		},
   	]
 });
diff --git a/resources/icons/mastodon.png b/resources/icons/mastodon.png
new file mode 100644
index 00000000..92048876
Binary files /dev/null and b/resources/icons/mastodon.png differ