diff --git a/_data/clients/atalk.yml b/_data/clients/atalk.yml
index e3d3750..0eeb331 100644
--- a/_data/clients/atalk.yml
+++ b/_data/clients/atalk.yml
@@ -5,3 +5,5 @@ testing: yes
 done: yes
 status: 100
 os_support: [Android]
+implementation_version: '1.0.1'
+implementation_date: '2018-01-07'
diff --git a/_data/clients/beagle_im.yml b/_data/clients/beagle_im.yml
index 4e94201..36165e7 100644
--- a/_data/clients/beagle_im.yml
+++ b/_data/clients/beagle_im.yml
@@ -4,3 +4,5 @@ tracking_issue: https://projects.tigase.net/issue/beagleim-47
 done: yes
 status: 100
 os_support: [macOS]
+implementation_version: '3.0'
+implementation_date: '2019-06-06'
diff --git a/_data/clients/blabber_im.yml b/_data/clients/blabber_im.yml
index 4ea2187..ef40cad 100644
--- a/_data/clients/blabber_im.yml
+++ b/_data/clients/blabber_im.yml
@@ -5,3 +5,5 @@ testing: yes
 done: yes
 status: 100
 os_support: [Android]
+implementation_version: '1.6.0'
+implementation_date: '2015-08-15'
diff --git a/_data/clients/conversations.yml b/_data/clients/conversations.yml
index 4adc6ca..0dc18be 100644
--- a/_data/clients/conversations.yml
+++ b/_data/clients/conversations.yml
@@ -5,3 +5,5 @@ testing: yes
 done: yes
 status: 100
 os_support: [Android]
+implementation_version: '1.6.0'
+implementation_date: '2015-08-15'
diff --git a/_data/clients/converse_js.yml b/_data/clients/converse_js.yml
index 6c1b897..4104f44 100644
--- a/_data/clients/converse_js.yml
+++ b/_data/clients/converse_js.yml
@@ -6,3 +6,5 @@ testing: yes
 done: yes
 status: 100
 os_support: [Browser]
+implementation_version: '4.0.0'
+implementation_date: '2018-09-07'
diff --git a/_data/clients/dino.yml b/_data/clients/dino.yml
index 76d08ef..d3219d8 100644
--- a/_data/clients/dino.yml
+++ b/_data/clients/dino.yml
@@ -6,3 +6,5 @@ testing: yes
 done: yes
 status: 100
 os_support: [BSD,Linux]
+implementation_version: '0.1.0'
+implementation_date: '2020-01-29'
diff --git a/_data/clients/gajim.yml b/_data/clients/gajim.yml
index 2250a6d..5e3e7c0 100644
--- a/_data/clients/gajim.yml
+++ b/_data/clients/gajim.yml
@@ -6,3 +6,5 @@ testing: yes
 done: yes
 status: 100
 os_support: [BSD,Linux,macOS,Windows]
+implementation_version: '0.16 (plugin)'
+implementation_date: '2016-01-10'
diff --git a/_data/clients/jsxc.yml b/_data/clients/jsxc.yml
index fb89aba..e58acb0 100644
--- a/_data/clients/jsxc.yml
+++ b/_data/clients/jsxc.yml
@@ -4,3 +4,5 @@ tracking_issue: https://github.com/jsxc/jsxc/issues/228
 work_in_progress: yes
 os_support: [Browser]
 status: 100
+implementation_version: '4.0.0'
+implementation_date: '2020-04-08'
diff --git a/_data/clients/kaidan.yml b/_data/clients/kaidan.yml
index f2c75ae..31df3ff 100644
--- a/_data/clients/kaidan.yml
+++ b/_data/clients/kaidan.yml
@@ -6,3 +6,5 @@ testing: yes
 done: yes
 status: 100
 os_support: [Android,Linux,macOS,Windows]
+implementation_version: '0.9.0'
+implementation_date: '2023-04-30'
diff --git a/_data/clients/libervia.yml b/_data/clients/libervia.yml
index 61279cb..2a0f5c2 100644
--- a/_data/clients/libervia.yml
+++ b/_data/clients/libervia.yml
@@ -6,3 +6,5 @@ testing: yes
 done: yes
 status: 100
 os_support: [Android,BSD,Linux,macOS,Windows]
+implementation_version: '0.7'
+implementation_date: '2019-12-30'
diff --git a/_data/clients/monal.yml b/_data/clients/monal.yml
index 4f995a8..a0206f9 100644
--- a/_data/clients/monal.yml
+++ b/_data/clients/monal.yml
@@ -6,3 +6,5 @@ testing: yes
 done: yes
 status: 100
 os_support: [iOS,macOS]
+implementation_version: '2.2'
+implementation_date: '2018-09-08'
diff --git a/_data/clients/monocles_chat.yml b/_data/clients/monocles_chat.yml
index 6725639..3b02fae 100644
--- a/_data/clients/monocles_chat.yml
+++ b/_data/clients/monocles_chat.yml
@@ -5,3 +5,5 @@ testing: yes
 done: yes
 status: 100
 os_support: [Android]
+implementation_version: '1.1'
+implementation_date: '2021-05-22'
diff --git a/_data/clients/movim.yml b/_data/clients/movim.yml
index 7d79675..12ca552 100644
--- a/_data/clients/movim.yml
+++ b/_data/clients/movim.yml
@@ -5,3 +5,5 @@ work_in_progress: yes
 done: yes
 status: 100
 os_support: [Browser,Android,Linux,macOS,Windows]
+implementation_version: '0.20'
+implementation_date: '2022-02-19'
diff --git a/_data/clients/poezio.yml b/_data/clients/poezio.yml
index d9db093..0f57909 100644
--- a/_data/clients/poezio.yml
+++ b/_data/clients/poezio.yml
@@ -6,3 +6,5 @@ work_in_progress: yes
 testing: yes
 done: yes
 status: 100
+implementation_version: '0.13'
+implementation_date: '2020-05-24'
diff --git a/_data/clients/profanity.yml b/_data/clients/profanity.yml
index ff48ef9..d6411f9 100644
--- a/_data/clients/profanity.yml
+++ b/_data/clients/profanity.yml
@@ -5,3 +5,5 @@ work_in_progress: yes
 testing: yes
 status: 100
 os_support: [BSD,Linux,macOS]
+implementation_version: '0.7.0'
+implementation_date: '2019-07-31'
diff --git a/_data/clients/quicksy.yml b/_data/clients/quicksy.yml
index 33b095e..c9fa83c 100644
--- a/_data/clients/quicksy.yml
+++ b/_data/clients/quicksy.yml
@@ -5,3 +5,5 @@ testing: yes
 done: yes
 status: 100
 os_support: [Android]
+implementation_version: '1.6.0'
+implementation_date: '2015-08-15'
diff --git a/_data/clients/siskin_im.yml b/_data/clients/siskin_im.yml
index 8c5d12e..2bd391e 100644
--- a/_data/clients/siskin_im.yml
+++ b/_data/clients/siskin_im.yml
@@ -4,3 +4,5 @@ tracking_issue: https://projects.tigase.net/issue/siskinim-101
 done: yes
 status: 100
 os_support: [iOS]
+implementation_version: '5.0'
+implementation_date: '2019-06-06'
diff --git a/_data/clients/snikket.yml b/_data/clients/snikket.yml
index 81a0e78..5d47ce4 100644
--- a/_data/clients/snikket.yml
+++ b/_data/clients/snikket.yml
@@ -4,4 +4,5 @@ work_in_progress: yes
 testing: yes
 done: yes
 status: 100
-os_support: [Android]
+os_support: [Android,iOS]
+implementation_version: '1.6.0 / 1.1'
diff --git a/_data/clients/stork_im.yml b/_data/clients/stork_im.yml
index 7973525..8936bfa 100644
--- a/_data/clients/stork_im.yml
+++ b/_data/clients/stork_im.yml
@@ -4,3 +4,4 @@ tracking_issue: https://projects.tigase.net/issue/stork-265
 done: yes
 status: 100
 os_support: [Android]
+implementation_version: '3.0.26'
diff --git a/_data/clients/weechat-xmpp.yml b/_data/clients/weechat-xmpp.yml
index dfdc9f2..f613ab0 100644
--- a/_data/clients/weechat-xmpp.yml
+++ b/_data/clients/weechat-xmpp.yml
@@ -3,3 +3,5 @@ url: https://github.com/bqv/weechat-xmpp/
 status: 100
 done: yes
 os_support: [BSD,Linux,macOS]
+implementation_version: '8759d96'
+implementation_date: '202-01-10'
diff --git a/_data/clients/xabber_web.yml b/_data/clients/xabber_web.yml
index 10cb42c..80e8caf 100644
--- a/_data/clients/xabber_web.yml
+++ b/_data/clients/xabber_web.yml
@@ -4,3 +4,5 @@ tracking_issue: https://github.com/redsolution/xabber-web/issues/3
 work_in_progress: no
 status: 100
 os_support: [Browser]
+implementation_version: '2.2.0'
+implementation_date: '2020-12-30'
diff --git a/_includes/client_detail.html b/_includes/client_detail.html
index 75b44f5..1a4e140 100644
--- a/_includes/client_detail.html
+++ b/_includes/client_detail.html
@@ -18,6 +18,13 @@ <h3 id="{{ client.name }}">{{ client.name }}</h3>
     </dd>
     {% endif %}
 
+    {% if client.implementation_version %}
+    <dt>Implementation</dt>
+    <dd>
+	Implemented since version {{ client.implementation_version }}{% if client.implementation_date %} ({{ client.implementation_date }}){% endif %}
+    </dd>
+    {% endif %}
+
     {% if client.tracking_issue %}
     <dt>Tracking Issue</dt>
     <dd>
diff --git a/_includes/client_row.html b/_includes/client_row.html
index ed3eed5..327512d 100644
--- a/_includes/client_row.html
+++ b/_includes/client_row.html
@@ -2,7 +2,7 @@
     <td><a href="#{{ client.name }}" alt="{{ client.name }}">{{ client.name }}</a></td>
     <td>
         {% if client.tracking_issue %}<a href="{{ client.tracking_issue }}">{% endif %}
-            {% if client.status == 100 %}<span title="OMEMO is supported">🎉</span>
+            {% if client.status == 100 %}<span title="OMEMO is supported">🎉{% if client.implementation_version %} Since <b>{{ client.implementation_version }}</b>{% endif %}</span>
             {% elsif client.declined %}<span title="Client will not support OMEMO">😭</span>
             {% elsif client.tracking_issue %}<span title="Developer(s) are working to support OMEMO">🔧</span>
             {% elsif client.status_inactive %}<span title="Developer(s) are not currently working on OMEMO support">⏸️</span>