diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0abba628..c738d7854 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,13 +2,15 @@
 
 ### Upcoming Bug Fixes
 ### Upcoming Features
+  1. [#776](https://github.com/influxdata/chronograf/issues/776): Add layout for telegraf's diskio system plugin
+
 ### Upcoming UI Improvements
 
 ## v1.1.0-beta6 [2017-01-13]
 ### Bug Fixes
   1. [#748](https://github.com/influxdata/chronograf/pull/748): Fix missing kapacitors on source index page
-  1. [#755](https://github.com/influxdata/chronograf/pull/755): Fix kapacitor basic auth proxying
-  2. [#704](https://github.com/influxdata/chronograf/issues/704): Fix RPM and DEB install script and systemd unit file
+  2. [#755](https://github.com/influxdata/chronograf/pull/755): Fix kapacitor basic auth proxying
+  3. [#704](https://github.com/influxdata/chronograf/issues/704): Fix RPM and DEB install script and systemd unit file
 
 ### Features
   1. [#660](https://github.com/influxdata/chronograf/issues/660): Add option to accept any certificate from InfluxDB
diff --git a/README.md b/README.md
index 1c84436f3..350c74754 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,13 @@ Currently, Chronograf offers dashboard templates for the following Telegraf inpu
 * RabbitMQ
 * Redis
 * Riak
-* System
+* [System](https://github.com/influxdata/telegraf/blob/master/plugins/inputs/system/SYSTEM_README.md)
+    * [CPU](https://github.com/influxdata/telegraf/blob/master/plugins/inputs/system/CPU_README.md)
+    * [Disk](https://github.com/influxdata/telegraf/blob/master/plugins/inputs/system/DISK_README.md)
+    * [DiskIO](https://github.com/influxdata/telegraf/blob/master/plugins/inputs/system/disk.go#L136)
+    * [Memory](https://github.com/influxdata/telegraf/blob/master/plugins/inputs/system/MEM_README.md)
+    * [Netstat](https://github.com/influxdata/telegraf/blob/master/plugins/inputs/system/NETSTAT_README.md)
+    * [Processes](https://github.com/influxdata/telegraf/blob/master/plugins/inputs/system/PROCESSES_README.md)
 * Varnish
 * Windows Performance Counters
 
diff --git a/canned/diskio.json b/canned/diskio.json
new file mode 100644
index 000000000..254306d2c
--- /dev/null
+++ b/canned/diskio.json
@@ -0,0 +1,33 @@
+{
+  "id": "9e3a9fcd-a363-4470-991e-a4d6987a94c8",
+  "measurement": "diskio",
+  "app": "system",
+  "autoflow": true,
+  "cells": [
+    {
+      "x": 0,
+      "y": 0,
+      "w": 4,
+      "h": 4,
+      "i": "7f647740-d9f0-4012-8e7a-5d898c8f271e",
+      "name": "System – Disk MB/s",
+      "queries": [
+        {
+          "query": "SELECT non_negative_derivative(max(\"read_bytes\"), 1s) / 1000000 AS \"read_megabytes_per_second\" FROM diskio",
+          "groupbys": [
+            "\"name\""
+          ],
+          "wheres": [],
+          "label": "MB/s"
+        },
+        {
+          "query": "SELECT non_negative_derivative(max(\"write_bytes\"), 1s) / 1000000 AS \"write_megabytes_per_second\" FROM diskio",
+          "groupbys": [
+            "\"name\""
+          ],
+          "wheres": []
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file