diff --git a/clients_icons/clients.py b/clients_icons/clients.py
index eb1411e..c5f1f17 100644
--- a/clients_icons/clients.py
+++ b/clients_icons/clients.py
@@ -28,6 +28,7 @@ CLIENTS = {
     'Conversations Legacy': ['conversations-legacy.png', 'Conversations Legacy'],
     'http://digsby.com/caps': ['digsby.png', 'Digsby'],
     'https://dino.im': ['dino.png', 'Dino'],
+    'http://emacs-jabber.sourceforge.net': ['emacs.png', 'Emacs Jabber client'],
     'http://emess.eqx.su/caps': ['emess.png', 'Emess'],
     'http://live.gnome.org/empathy/caps': \
         ['telepathy.freedesktop.org.png', 'Empathy'],
diff --git a/clients_icons/icons/emacs.png b/clients_icons/icons/emacs.png
new file mode 100644
index 0000000..6a3bc34
Binary files /dev/null and b/clients_icons/icons/emacs.png differ