diff --git a/bin/bcoin-cli b/bin/bcoin-cli
new file mode 100755
index 00000000..feb97d30
--- /dev/null
+++ b/bin/bcoin-cli
@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+
+'use strict';
+
+require('bclient/bin/bcoin-cli');
diff --git a/bin/bwallet-cli b/bin/bwallet-cli
new file mode 100755
index 00000000..18170b97
--- /dev/null
+++ b/bin/bwallet-cli
@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+
+'use strict';
+
+require('bclient/bin/bwallet-cli');
diff --git a/bin/cli b/bin/cli
index 35a33866..018b88b2 100755
--- a/bin/cli
+++ b/bin/cli
@@ -4,11 +4,4 @@
 
 console.error('%s%s',
   'Warning: The `bcoin cli` interface is deprecated.\n',
-  'Please use `bcoin-cli` ($ npm install bclient).');
-
-if (process.argv.length > 2 && process.argv[2] === 'wallet') {
-  process.argv.splice(2, 1); // Evil hack.
-  require('bclient/bin/bwallet-cli');
-} else {
-  require('bclient/bin/bcoin-cli');
-}
+  'Please use `bcoin-cli` and `bwallet-cli` instead.');
diff --git a/package.json b/package.json
index 8885e1e4..7110f785 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,9 @@
     "bcoin": "./bin/bcoin",
     "bcoin-node": "./bin/node",
     "bcoin-spvnode": "./bin/spvnode",
-    "bwallet": "./bin/bwallet"
+    "bwallet": "./bin/bwallet",
+    "bcoin-cli": "./bin/bcoin-cli",
+    "bwallet-cli": "./bin/bwallet-cli"
   },
   "scripts": {
     "browserify": "browserify -s bcoin lib/bcoin-browser.js | uglifyjs -c > bcoin.js",