diff --git a/research/computing/services.md b/research/computing/services.md
index 11aafd5db022f507c282cca1fa4363d9d08329ec..d5abb3ec52fb1c73fdb1e91890943f0de4701379 100644
--- a/research/computing/services.md
+++ b/research/computing/services.md
@@ -39,7 +39,7 @@ Misc:
 * [BigBlue Button](http://www.bigbluebutton.org).
 * [Rocket.Chat](https://rocket.chat/#!).
 * [Mattermost](https://about.mattermost.com/).
-* [Riot. Break through.](https://riot.im/).
+* [Riot. Break through](https://riot.im/).
 * [Signal Server](https://github.com/whispersystems/signal-server).
 * [Wire Server](https://github.com/wireapp/wire-server).
 * [Katzenpost](https://katzenpost.mixnetworks.org/).
@@ -135,7 +135,9 @@ Social networking
 * [RedMatrix](https://redmatrix.me/).
 * [Hubzilla](http://hubzilla.org/).
 * [commento: A lightweight, open source, tracking-free comment engine alternative to Disqus](https://github.com/adtac/commento)
-* Calendar: [Demosphere](https://demosphere.net/en/content/download) with [browser extension](https://demosphere.net/en/content/browser-extension).
+* Calendar:
+  * [Demosphere](https://demosphere.net/en/content/download) with [browser extension](https://demosphere.net/en/content/browser-extension).
+  * [Gancio](https://gancio.org/): a shared agenda for local communities.
 
 Timebanking
 -----------
@@ -464,6 +466,14 @@ Radio
 
 * [OpenWebRX](https://sdr.hu/openwebrx) ([código](https://github.com/simonyiszk/openwebrx)).
 
+Education
+---------
+
+* [Openki](https://gitlab.com/Openki/Openki/): Course-Organization-Platform: A
+  tool to build up and organize local communities – Open education for real.
+* [Kiwix lets you access free knowledge – even offline](https://www.kiwix.org/) with
+  [kiwix-serve](https://www.kiwix.org/en/downloads/kiwix-serve/).
+
 References
 ----------