5ce96c3f77347e3c5bb60a86fb72b9c2333e34c3

 1diff --git a/plugins/mix/README.md b/plugins/mix/README.md
 2index 63476dd6b4f0682f98f6e2b1beaf4f74d75950cb..878f370f20191173328327af0144205df2df2f4c 100644
 3--- a/plugins/mix/README.md
 4+++ b/plugins/mix/README.md
 5@@ -16,3 +16,4 @@ plugins=(... mix)
 6 | Phoenix v1.3.0 and above| [Phoenix](https://hexdocs.pm/phoenix/Phoenix.html)       |
 7 | Ecto                    | [Ecto](https://hexdocs.pm/ecto/Ecto.html)                |
 8 | Hex                     | [Hex](https://hex.pm/)                                   |
 9+| Nerves                  | [Nerves](https://nerves-project.org/)                    |
10diff --git a/plugins/mix/_mix b/plugins/mix/_mix
11index ecbe7e2d3ae802c0253ee09946901adfcb2b7869..61fa1cf2513e8b68ffd108a0cf302c28384faa4d 100644
12--- a/plugins/mix/_mix
13+++ b/plugins/mix/_mix
14@@ -31,6 +31,9 @@ _1st_arguments=(
15     'ecto.migrations:Displays the up / down migration status'
16     'ecto.rollback:Reverts applied migrations'
17     'escript.build:Builds an escript for the project'
18+    'firmware:Nerves - Build a firmware image for the selected target platform'
19+    'firmware.burn:Nerves - Writes the generated firmware image to an attached SDCard or file'
20+    'firmware.image:Nerves - Create a firmware image file that can be copied byte-for-byte'
21     'help:Print help information for tasks'
22     'hex:Print hex help information'
23     'hex.config:Read or update hex config'
24@@ -48,6 +51,11 @@ _1st_arguments=(
25     'local.phoenix:Updates Phoenix locally'
26     'local.phx:Updates the Phoenix project generator locally'
27     'local.rebar:Install rebar locally'
28+    'nerves.artifact:Create an artifact for a specified Nerves package'
29+    'nerves.artifact.get:Nerves get artifacts'
30+    'nerves.info:Prints Nerves system information'
31+    'nerves.new:Create a new Nerves application'
32+    'nerves.release.init:Prepare a new Nerves project for use with releases'
33     'new:Create a new Elixir project'
34     'phoenix.digest:Digests and compress static files'
35     'phoenix.gen.channel:Generates a Phoenix channel'