diff --git a/lib/cli/device/index.js b/lib/cli/device/index.js
index 7fdbc359..124fb1fb 100644
--- a/lib/cli/device/index.js
+++ b/lib/cli/device/index.js
@@ -1,4 +1,4 @@
-module.exports.command = 'device <serial>'
+module.exports.command = 'device'
 
 module.exports.builder = function(yargs) {
   return yargs
@@ -101,6 +101,11 @@ module.exports.builder = function(yargs) {
     , type: 'string'
     , default: 'ws://${publicIp}:${publicPort}'
     })
+    .option('serial', {
+      describe: 'The USB serial number of the device.'
+    , type: 'string'
+    , demand: true
+    })
     .option('storage-url', {
       alias: 'r'
     , describe: 'The URL to the storage unit.'
diff --git a/lib/cli/provider/index.js b/lib/cli/provider/index.js
index e37d2670..1d68eba6 100644
--- a/lib/cli/provider/index.js
+++ b/lib/cli/provider/index.js
@@ -159,7 +159,8 @@ module.exports.handler = function(argv) {
       var fork = require('child_process').fork
 
       var args = [
-        'device', device.id
+        'device'
+      , '--serial', device.id
       , '--provider', argv.name
       , '--screen-port', ports.shift()
       , '--connect-port', ports.shift()
diff --git a/package.json b/package.json
index 71e53ce9..0dbf322c 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,9 @@
   "bin": {
     "stf": "./bin/stf"
   },
+  "yargs": {
+    "duplicate-arguments-array": false
+  },
   "scripts": {
     "test": "gulp test",
     "prepublish": "bower install && not-in-install && gulp build || in-install"