diff --git a/libs/yjabber/xmpputils.cpp b/libs/yjabber/xmpputils.cpp
index 42c163a6..48486829 100644
--- a/libs/yjabber/xmpputils.cpp
+++ b/libs/yjabber/xmpputils.cpp
@@ -1515,10 +1515,13 @@ XmlElement* XMPPUtils::createEntityCaps(const String& hash, const char* node)
 }
 
 // Create a 'c' entity capability element as defined by GTalk
-XmlElement* XMPPUtils::createEntityCapsGTalkV1()
+XmlElement* XMPPUtils::createEntityCapsGTalkV1(const char* node)
 {
     XmlElement* c = createElement(XmlTag::EntityCapsTag,XMPPNamespace::EntityCaps);
-    c->setAttribute("node","http://www.google.com/xmpp/client/caps");
+    if (node)
+	c->setAttributeValid("node",node);
+    else
+	c->setAttribute("node","http://www.google.com/xmpp/client/caps");
     c->setAttribute("ver","1.0");
     c->setAttribute("ext","voice-v1");
     return c;
diff --git a/libs/yjabber/xmpputils.h b/libs/yjabber/xmpputils.h
index 72aa48e7..f4360a91 100644
--- a/libs/yjabber/xmpputils.h
+++ b/libs/yjabber/xmpputils.h
@@ -1664,9 +1664,10 @@ public:
 
     /**
      * Create a 'c' entity capability element as defined by GTalk
+     * @param node Optional node attribute, defaults to GTalk's node
      * @return A valid XmlElement pointer
      */
-    static XmlElement* createEntityCapsGTalkV1();
+    static XmlElement* createEntityCapsGTalkV1(const char* node = 0);
 
     /**
      * Create an 'presence' element