diff --git a/src/cli/commands/version.js b/src/cli/commands/version.js
index 39ab268348..cc1b52f99b 100644
--- a/src/cli/commands/version.js
+++ b/src/cli/commands/version.js
@@ -42,7 +42,7 @@ module.exports = {
           return
         }
 
-        console.log('ipfs version', version)
+        console.log(`js-ipfs version: ${version}`)
       })
     })
   }
diff --git a/src/core/ipfs/version.js b/src/core/ipfs/version.js
index 4d8340c831..ec48bd504b 100644
--- a/src/core/ipfs/version.js
+++ b/src/core/ipfs/version.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const utils = require('../utils')
+const readPkgUp = require('read-pkg-up')
 
 module.exports = function version (self) {
   return (opts, callback) => {
@@ -9,18 +9,10 @@ module.exports = function version (self) {
       opts = {}
     }
 
-    utils.ifRepoExists(self._repo, (err) => {
-      if (err) {
-        return callback(err)
-      }
-
-      self._repo.config.get((err, config) => {
-        if (err) {
-          return callback(err)
-        }
-
-        callback(null, config.Version.Current)
+    readPkgUp()
+      .then((res) => {
+        callback(null, res.pkg.version)
       })
-    })
+      .catch(callback)
   }
 }
diff --git a/test/cli/test-version.js b/test/cli/test-version.js
index 931c8a2785..dc0186f3f0 100644
--- a/test/cli/test-version.js
+++ b/test/cli/test-version.js
@@ -16,7 +16,7 @@ describe('version', () => {
       nexpect.spawn('node', [process.cwd() + '/src/cli/bin.js', 'version'], {env})
         .run((err, stdout, exitcode) => {
           expect(err).to.not.exist
-          expect(stdout[0]).to.equal('ipfs version 0.4.0-dev')
+          expect(stdout[0]).to.equal('js-ipfs version: 0.14.1')
           expect(exitcode).to.equal(0)
           done()
         })
@@ -46,7 +46,7 @@ describe('version', () => {
         .run((err, stdout, exitcode) => {
           expect(err).to.not.exist
           expect(exitcode).to.equal(0)
-          expect(stdout[0]).to.equal('ipfs version 0.4.0-dev')
+          expect(stdout[0]).to.equal('js-ipfs version: 0.14.1')
           done()
         })
     })
diff --git a/test/core/both/test-version.js b/test/core/both/test-version.js
index 2a4303b8b3..c15fcf2469 100644
--- a/test/core/both/test-version.js
+++ b/test/core/both/test-version.js
@@ -16,7 +16,7 @@ describe('version', () => {
   it('get version', (done) => {
     ipfs.version((err, version) => {
       expect(err).to.not.exist
-      expect(version).to.equal('0.4.0-dev')
+      expect(version).to.equal('0.14.1')
       done()
     })
   })
diff --git a/test/http-api/test-version.js b/test/http-api/test-version.js
index 572a849ad5..f9887359c2 100644
--- a/test/http-api/test-version.js
+++ b/test/http-api/test-version.js
@@ -18,7 +18,7 @@ module.exports = (httpAPI) => {
           method: 'GET',
           url: '/api/v0/version'
         }, (res) => {
-          expect(res.result.Version).to.equal('0.4.0-dev')
+          expect(res.result.Version).to.equal('0.14.1')
           expect(res.result).to.have.a.property('Commit')
           expect(res.result).to.have.a.property('Repo')
           done()