diff --git a/data/pixmaps/agents/pubsub.png b/data/pixmaps/agents/pubsub.png
new file mode 100644
index 0000000000000000000000000000000000000000..22f262bf58f5b0dab3985416a16a465fa0db604f
Binary files /dev/null and b/data/pixmaps/agents/pubsub.png differ
diff --git a/src/disco.py b/src/disco.py
index e9f2557ddc52100104d29683dc5bf732ba7a04f1..cdb31585ac460837eed0f912eff2fc4551c0d79f 100644
--- a/src/disco.py
+++ b/src/disco.py
@@ -86,6 +86,7 @@ def _gen_agent_type_info():
 		('_jid', 'weather'):			(False, 'weather.png'),
 		('gateway', 'sip'):			(False, 'sip.png'),
 		('directory', 'user'):		(None, 'jud.png'),
+		('pubsub', 'generic'):		(None, 'pubsub.png'),
 		
 		# Transports
 		('conference', 'irc'):		(False, 'irc.png'),