diff --git a/packages/xo-lib/api.js b/packages/xo-lib/api.js
index d333e6aed..8a56b2dc7 100644
--- a/packages/xo-lib/api.js
+++ b/packages/xo-lib/api.js
@@ -5,8 +5,8 @@
 var Bluebird = require('bluebird')
 var EventEmitter = require('events').EventEmitter
 var inherits = require('util').inherits
-var jsonRpc = require('json-rpc')
-var MethodNotFound = require('json-rpc/errors').MethodNotFound
+var jsonRpc = require('@julien-f/json-rpc')
+var MethodNotFound = require('@julien-f/json-rpc/errors').MethodNotFound
 var startsWith = require('lodash.startswith')
 var WebSocket = require('ws')
 
diff --git a/packages/xo-lib/package.json b/packages/xo-lib/package.json
index 5741386cf..9e6dba7c7 100644
--- a/packages/xo-lib/package.json
+++ b/packages/xo-lib/package.json
@@ -22,10 +22,10 @@
     "test": "standard && mocha '*.spec.js'"
   },
   "dependencies": {
+    "@julien-f/json-rpc": "^0.3.5",
     "bluebird": "^2.9.6",
     "event-to-promise": "^0.3.2",
     "exec-promise": "^0.5.1",
-    "json-rpc": "git://github.com/julien-f/js-json-rpc#v0.3.1",
     "lodash.assign": "^3.0.0",
     "lodash.foreach": "^3.0.1",
     "lodash.indexof": "^3.0.0",