diff --git a/.travis.yml b/.travis.yml
index 615d3e60..8b3f6193 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,4 +4,4 @@ node_js:
   - 0.8
 
 notifications:
-  irc: "irc.freenode.org#socket.io"
+  irc: "irc.freenode.org##socket.io"
diff --git a/lib/engine.io.js b/lib/engine.io.js
index f5d52459..38d656d8 100644
--- a/lib/engine.io.js
+++ b/lib/engine.io.js
@@ -51,7 +51,7 @@ exports.transports = require('./transports');
  * @api public
  */
 
-exports.parser = require('./parser');
+exports.parser = require('engine.io-parser');
 
 /**
  * Crates an http.Server exclusively used for WS upgrades.
diff --git a/lib/parser.js b/lib/parser.js
deleted file mode 100644
index 5ac7de1b..00000000
--- a/lib/parser.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * Exposes the client parser to avoid code repetition.
- */
-
-module.exports = require('engine.io-client/lib/parser');
diff --git a/lib/transport.js b/lib/transport.js
index a07a901f..54e47778 100644
--- a/lib/transport.js
+++ b/lib/transport.js
@@ -4,7 +4,7 @@
  */
 
 var EventEmitter = require('events').EventEmitter
-  , parser = require('./parser')
+  , parser = require('engine.io-parser')
   , debug = require('debug')('engine:transport');
 
 /**
diff --git a/lib/transports/polling.js b/lib/transports/polling.js
index 2b869e94..75f31442 100644
--- a/lib/transports/polling.js
+++ b/lib/transports/polling.js
@@ -4,7 +4,7 @@
  */
 
 var Transport = require('../transport')
-  , parser = require('../parser')
+  , parser = require('engine.io-parser')
   , debug = require('debug')('engine:polling')
 
 /**
diff --git a/lib/transports/websocket.js b/lib/transports/websocket.js
index ca543b06..ccafa74f 100644
--- a/lib/transports/websocket.js
+++ b/lib/transports/websocket.js
@@ -4,7 +4,7 @@
  */
 
 var Transport = require('../transport')
-  , parser = require('../parser')
+  , parser = require('engine.io-parser')
   , debug = require('debug')('engine:ws')
 
 /**
diff --git a/package.json b/package.json
index 6a2b8378..93c6664f 100644
--- a/package.json
+++ b/package.json
@@ -17,15 +17,20 @@
   , "dependencies": {
         "debug": "0.6.0"
       , "ws": "~0.4.21"
-      , "engine.io-client": "0.4.1"
+      , "engine.io-parser": "0.1.0"
       , "base64id": "0.1.0"
     }
   , "devDependencies": {
         "mocha": "*"
       , "expect.js": "*"
       , "superagent": "*"
+      , "engine.io-client": "0.4.1"
       , "ws": "*"
       , "s": "*"
     }
   , "scripts" : { "test" : "make test" }
+  , "repository": {
+        "type": "git"
+      , "url": "git@github.com:LearnBoost/engine.io.git"
+  }
 }
diff --git a/test/server.js b/test/server.js
index 01e70d77..efb6a51e 100644
--- a/test/server.js
+++ b/test/server.js
@@ -5,8 +5,7 @@
  */
 
 var http = require('http')
-  , parser = eio.parser
-  , WebSocket = require('ws');
+  WebSocket = require('ws');
 
 /**
  * Tests.