diff --git a/package.json b/package.json
index 3050a58937..7b3aa922d1 100644
--- a/package.json
+++ b/package.json
@@ -92,6 +92,7 @@
     "boom": "^7.2.0",
     "bs58": "^4.0.1",
     "byteman": "^1.3.5",
+    "cid-tool": "~0.1.0",
     "cids": "~0.5.3",
     "debug": "^3.1.0",
     "err-code": "^1.1.2",
diff --git a/src/cli/commands/cid.js b/src/cli/commands/cid.js
new file mode 100644
index 0000000000..2738ba0cee
--- /dev/null
+++ b/src/cli/commands/cid.js
@@ -0,0 +1,21 @@
+'use strict'
+
+const path = require('path')
+
+const cidCommandsPath = path.join(
+  __dirname, '..', '..', '..', 'node_modules', 'cid-tool', 'src', 'cli', 'commands'
+)
+
+module.exports = {
+  command: 'cid <command>',
+
+  description: 'Convert, format and discover properties of CIDs.',
+
+  builder (yargs) {
+    return yargs
+      .commandDir(cidCommandsPath)
+  },
+
+  handler (argv) {
+  }
+}
diff --git a/test/cli/commands.js b/test/cli/commands.js
index e6ae40498a..a14a31e826 100644
--- a/test/cli/commands.js
+++ b/test/cli/commands.js
@@ -4,7 +4,7 @@
 const expect = require('chai').expect
 const runOnAndOff = require('../utils/on-and-off')
 
-const commandCount = 81
+const commandCount = 82
 describe('commands', () => runOnAndOff((thing) => {
   let ipfs