diff --git a/research.mdwn b/research.mdwn
index 6fdcfefc3f13dbf0b5a9feb5ef6455e4114e6168..cbc3913dc98e4aae1a0be3f567f98515094f7e96 100644
--- a/research.mdwn
+++ b/research.mdwn
@@ -28,6 +28,8 @@ Raw list with things to try, research, evaluate develop and maybe deploy!
 * https://github.com/gorhill/uMatrix
 * https://github.com/metabase/metabase
 * https://lede-project.org/start
+* https://github.com/shadowsocks/shadowsocks-go
+* https://botman.io
 
 ## Multimedia
 
diff --git a/services.mdwn b/services.mdwn
index 36d91403534421bf4ee83414195da6a8bc550895..af7d6f9dc460cee3fb936690e6d74ca28870d92d 100644
--- a/services.mdwn
+++ b/services.mdwn
@@ -108,6 +108,7 @@ Social media
 * [Incoma](https://github.com/Incoma/Incoma).
 * [Sneer](https://github.com/klauswuestefeld/sneer).
 * [Noosfero](http://noosfero.org/).
+* [Mastodon](https://mastodon.social).
 * Democracia: [Liquid Democracy](https://wiki.piratenpartei.de/Liquid_Democracy) / [Liquid Feedback](http://liquidfeedback.org).
 * [Briar](http://briar.sourceforge.net).
 * [Twister](http://twister.net.co/).