diff --git a/src/buddy.cpp b/src/buddy.cpp
index 6f9194295470f64b40be1a5756c59df04ae14a7f..fe7f906becdd2839433fd36fba036a7a6f5e38a6 100644
--- a/src/buddy.cpp
+++ b/src/buddy.cpp
@@ -95,7 +95,8 @@ Swift::Presence::ref Buddy::generatePresenceStanza(int features, bool only_new)
 
 	if (presence->getType() != Swift::Presence::Unavailable) {
 		// caps
-// 		presence->addPayload(boost::shared_ptr<Swift::Payload>(new Swift::CapsInfo (CONFIG().caps)));
+		
+		presence->addPayload(boost::shared_ptr<Swift::Payload>(new Swift::CapsInfo(m_rosterManager->getUser()->getComponent()->getBuddyCapsInfo())));
 
 // 		if (features & 0/*TRANSPORT_FEATURE_AVATARS*/) {
 			presence->addPayload(boost::shared_ptr<Swift::Payload>(new Swift::VCardUpdate (getIconHash())));