@@ -24,10 +24,12 @@
 #include <assert.h>
 
 #import <ObjFW/ObjFW.h>
 
 #import "XMPPConnection.h"
+#import "XMPPDiscoEntity.h"
+#import "XMPPDiscoIdentity.h"
 #import "XMPPJID.h"
 #import "XMPPStanza.h"
 #import "XMPPIQ.h"
 #import "XMPPMessage.h"
 #import "XMPPPresence.h"
@@ -151,10 +153,53 @@
 {
 	of_log(@"Bound to JID: %@", [jid fullJID]);
 	of_log(@"Supports SM: %@",
 	    [conn_ supportsStreamManagement] ? @"YES" : @"NO");
 
+
+	XMPPDiscoEntity *discoEntity =
+	    [[XMPPDiscoEntity alloc] initWithConnection: conn];
+
+	[discoEntity addIdentity:
+	    [XMPPDiscoIdentity identityWithCategory: @"client"
+					       type: @"pc"
+					       name: @"ObjXMPP"]];
+
+	XMPPDiscoNode *nodeMusic =
+	    [XMPPDiscoNode discoNodeWithJID: jid
+				       node: @"music"
+				       name: @"My music"];
+	[discoEntity addChildNode: nodeMusic];
+
+	XMPPDiscoNode *nodeRHCP =
+	    [XMPPDiscoNode discoNodeWithJID: jid
+				       node: @"fa3b6"
+				       name: @"Red Hot Chili Peppers"];
+	[nodeMusic addChildNode: nodeRHCP];
+
+	XMPPDiscoNode *nodeStop =
+	    [XMPPDiscoNode discoNodeWithJID: jid
+				       node: @"qwe87"
+				       name: @"Can't Stop"];
+	[nodeRHCP addChildNode: nodeStop];
+
+	XMPPDiscoNode *nodeClueso = [XMPPDiscoNode discoNodeWithJID: jid
+							       node: @"ea386"
+							       name: @"Clueso"];
+	[nodeMusic addChildNode: nodeClueso];
+
+	XMPPDiscoNode *nodeChicago = [XMPPDiscoNode discoNodeWithJID: jid
+							      node: @"qwr87"
+							      name: @"Chicago"];
+	[nodeClueso addChildNode: nodeChicago];
+
+	[discoEntity addDiscoNode: nodeMusic];
+	[discoEntity addDiscoNode: nodeRHCP];
+	[discoEntity addDiscoNode: nodeClueso];
+	[discoEntity addDiscoNode: nodeStop];
+	[discoEntity addDiscoNode: nodeChicago];
+
 	[roster requestRoster];
 }
 
 - (void)rosterWasReceived: (XMPPRoster*)roster_
 {