diff --git a/mastodoncustomemojis/README.md b/mastodoncustomemojis/README.md
new file mode 100644
index 000000000..5dda7fa3c
--- /dev/null
+++ b/mastodoncustomemojis/README.md
@@ -0,0 +1,12 @@
+Mastodon Custom Emojis
+======================
+
+Main author Hypolite Petovan.
+
+Replace emojis shortcodes in Mastodon posts with their originating server custom emojis images.
+
+## License
+
+The _Mastodon Custom Emojis_ addon is licensed under the [3-clause BSD license][2] see the LICENSE file in the addons directory.
+
+[1]: http://opensource.org/licenses/BSD-3-Clause
diff --git a/mastodoncustomemojis/mastodoncustomemojis.php b/mastodoncustomemojis/mastodoncustomemojis.php
new file mode 100644
index 000000000..d7ce7426b
--- /dev/null
+++ b/mastodoncustomemojis/mastodoncustomemojis.php
@@ -0,0 +1,95 @@
+page['htmlhead'] .= <<
+
+
+
+HTML;
+}
+
+function mastodoncustomemojis_put_item_in_cache(Friendica\App $a, &$hook_data)
+{
+ // Mastodon uses OStatus, skipping other network protocols
+ if ($hook_data['item']['network'] != Friendica\Core\Protocol::OSTATUS) {
+ return;
+ }
+
+ $emojis = mastodoncustomemojis_get_custom_emojis_for_author($hook_data['item']['author-link']);
+
+ $hook_data["rendered-html"] = Friendica\Content\Smilies::replaceFromArray($hook_data["rendered-html"], $emojis);
+}
+
+function mastodoncustomemojis_get_custom_emojis_for_author($author_link)
+{
+ $return = ['texts' => [], 'icons' => []];
+
+ $url_parts = parse_url($author_link);
+
+ $api_base_url = $url_parts['scheme'] . '://' . $url_parts['host'] . ($url_parts['port'] ? ':' . $url_parts['port'] : '');
+
+ $cache_key = 'mastodoncustomemojis:' . $api_base_url;
+
+ $emojis = Friendica\Core\Cache::get($cache_key);
+ if (empty($emojis)) {
+ // Reset the emojis array
+ $emojis = $return;
+
+ $api_url = $api_base_url . '/api/v1/custom_emojis';
+
+ $ret = Friendica\Util\Network::fetchUrlFull($api_url);
+
+ if ($ret['success']) {
+ $emojis_array = json_decode($ret['body'], true);
+
+ if (is_array($emojis_array)) {
+ foreach ($emojis_array as $emoji) {
+ $emojis['texts'][] = ':' . $emoji['shortcode'] . ':';
+ $emojis['icons'][] = '';
+ }
+ }
+ }
+
+ Friendica\Core\Cache::set($cache_key, $emojis, Friendica\Core\Cache::WEEK);
+
+ $return = $emojis;
+ }
+
+ return $return;
+}