diff --git a/lib/xmpp-client/client.js b/lib/xmpp-client/client.js
index 732b8ee..1e00a7c 100644
--- a/lib/xmpp-client/client.js
+++ b/lib/xmpp-client/client.js
@@ -2,25 +2,11 @@ var sys = require('sys'),
 	xmpp = require('xmpp'),
 	events = require('events');
 
-var Jid = function(plain) {
-	var tmp = plain.split('/');
-	this.resource = (tmp.length == 1) ? 'node' : tmp[1];
-	tmp = tmp[0].split('@');
-	this.node = tmp[0];
-	this.domain = tmp[1];
-};
-
-exports.Jid = Jid;
-
-Jid.prototype.toString = function() {
-	return this.node + '@' + this.domain + '/' + this.resource;
-};
-
 var Client = function(_jid, password, host) {
 	events.EventEmitter.call(this);
 	this.debug = true;
 	var jabber = this;
-	this.jid = new Jid(_jid);
+	this.jid = new xmpp.JID(_jid);
 	this.host = (host == null) ? this.jid.domain : host;
 	this.rooms = {};
 	this._iq = 0;
diff --git a/test/test.js b/test/test.js
index de48308..0d4c0e6 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1,17 +1,17 @@
 var sys = require('sys'),
 	colors = require('colors'),
 	Client = require('../lib/xmpp-client').Client,
-	Jid = require('../lib/xmpp-client').Jid,
+	JID = require('xmpp').JID,
 	conf = require('./conf').conf;
 
 exports.testJid = function(test) {
 	test.expect(4);
-	var j = new Jid('mathieu@gtalk.com');
+	var j = new JID('mathieu@gtalk.com');
 	//sys.debug(JSON.stringify(j));
-	test.equals('mathieu', j.node);
+	test.equals('mathieu', j.user);
 	test.equals('gtalk.com', j.domain);
-	test.equals('node', j.resource);
-	j = new Jid('mathieu@jabber.org/machin');
+	test.equals(null, j.resource);
+	j = new JID('mathieu@jabber.org/machin');
 	//sys.debug(JSON.stringify(j));
 	test.equals('machin', j.resource);
 	test.done();