diff --git a/packages/xen-api/package.json b/packages/xen-api/package.json
index 8ef570e4b..935aeeb85 100644
--- a/packages/xen-api/package.json
+++ b/packages/xen-api/package.json
@@ -45,6 +45,7 @@
     "make-error": "^1.0.2",
     "minimist": "^1.1.1",
     "pw": "0.0.4",
+    "source-map-support": "^0.2.10",
     "xmlrpc": "^1.3.0",
     "xo-collection": "^0.3.0"
   },
diff --git a/packages/xen-api/src/cli.js b/packages/xen-api/src/cli.js
index d942a4d80..4c308d776 100755
--- a/packages/xen-api/src/cli.js
+++ b/packages/xen-api/src/cli.js
@@ -9,6 +9,9 @@ import {start as createRepl} from 'repl'
 
 import {createClient} from './'
 
+import sourceMapSupport from 'source-map-support'
+sourceMapSupport.install()
+
 const usage = `Usage: xen-api <url> <user>`
 
 const main = coroutine(function * (args) {