diff --git a/CHANGELOG.md b/CHANGELOG.md
index ddb7388b5..53246705c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ changed to just run docker commands in the Makefile. See `make docker-run` and
 - [#318](https://github.com/influxdb/telegraf/pull/318): Prometheus output. Thanks @oldmantaiter!
 - [#338](https://github.com/influxdb/telegraf/pull/338): Restart Telegraf on package upgrade. Thanks @linsomniac!
 - [#337](https://github.com/influxdb/telegraf/pull/337): Jolokia plugin, thanks @saiello!
+- [#317](https://github.com/influxdb/telegraf/issues/317): ZFS plugin, thanks @cornerot!
 
 ### Bugfixes
 - [#331](https://github.com/influxdb/telegraf/pull/331): Dont overwrite host tag in redis plugin.
diff --git a/README.md b/README.md
index ae89e57d2..f85a4b1e4 100644
--- a/README.md
+++ b/README.md
@@ -190,6 +190,7 @@ Telegraf currently has support for collecting metrics from:
 * rabbitmq
 * redis
 * rethinkdb
+* zfs
 * zookeeper
 * system
     * cpu
diff --git a/plugins/zfs/zfs.go b/plugins/zfs/zfs.go
index baafdaaef..559c80b95 100644
--- a/plugins/zfs/zfs.go
+++ b/plugins/zfs/zfs.go
@@ -62,7 +62,7 @@ func (z *Zfs) Gather(acc plugins.Accumulator) error {
 	for _, metric := range kstatMetrics {
 		lines, err := common.ReadLines(kstatPath + "/" + metric)
 		if err != nil {
-			panic(err)
+			return err
 		}
 		for i, line := range lines {
 			if i == 0 || i == 1 {