diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc3f2eb98..0b09e13e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,9 @@
 ### Release Notes
 - InfluxDB output config change: `url` is now `urls`, and is a list. Config files
 will still be backwards compatible if only `url` is specified.
+- **Breaking Change**: The CPU collection plugin has been refactored to fix some
+bugs and outdated dependency issues. At the same time, I also decided to fix
+a naming consistency issue, so cpu_percentageIdle will become cpu_usage_idle
 
 ### Features
 - [#143](https://github.com/influxdb/telegraf/issues/143): InfluxDB clustering support
@@ -19,6 +22,7 @@ will still be backwards compatible if only `url` is specified.
 - [#189](https://github.com/influxdb/telegraf/pull/189): Fix mem_used_perc. Thanks @mced!
 - [#192](https://github.com/influxdb/telegraf/issues/192): Increase compatibility of postgresql plugin. Now supports versions 8.1+
 - [#203](https://github.com/influxdb/telegraf/issues/203): EL5 rpm support. Thanks @ekini!
+- [#206](https://github.com/influxdb/telegraf/issues/206): CPU steal/guest values wrong on linux.
 
 ## v0.1.8 [2015-09-04]
 
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index fdbafa30a..3c8e342c9 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -143,38 +143,38 @@
 		},
 		{
 			"ImportPath": "github.com/shirou/gopsutil/common",
-			"Comment": "1.0.0-146-g9c0474c",
-			"Rev": "9c0474c2a7cbea73ea2d93fc5e1ef1c024caf761"
+			"Comment": "1.0.0-148-ga369a88",
+			"Rev": "a369a8857c47ba9bcf8bbcf316897fa123d73639"
 		},
 		{
 			"ImportPath": "github.com/shirou/gopsutil/cpu",
-			"Comment": "1.0.0-146-g9c0474c",
-			"Rev": "9c0474c2a7cbea73ea2d93fc5e1ef1c024caf761"
+			"Comment": "1.0.0-148-ga369a88",
+			"Rev": "a369a8857c47ba9bcf8bbcf316897fa123d73639"
 		},
 		{
 			"ImportPath": "github.com/shirou/gopsutil/disk",
-			"Comment": "1.0.0-146-g9c0474c",
-			"Rev": "9c0474c2a7cbea73ea2d93fc5e1ef1c024caf761"
+			"Comment": "1.0.0-148-ga369a88",
+			"Rev": "a369a8857c47ba9bcf8bbcf316897fa123d73639"
 		},
 		{
 			"ImportPath": "github.com/shirou/gopsutil/docker",
-			"Comment": "1.0.0-146-g9c0474c",
-			"Rev": "9c0474c2a7cbea73ea2d93fc5e1ef1c024caf761"
+			"Comment": "1.0.0-148-ga369a88",
+			"Rev": "a369a8857c47ba9bcf8bbcf316897fa123d73639"
 		},
 		{
 			"ImportPath": "github.com/shirou/gopsutil/load",
-			"Comment": "1.0.0-146-g9c0474c",
-			"Rev": "9c0474c2a7cbea73ea2d93fc5e1ef1c024caf761"
+			"Comment": "1.0.0-148-ga369a88",
+			"Rev": "a369a8857c47ba9bcf8bbcf316897fa123d73639"
 		},
 		{
 			"ImportPath": "github.com/shirou/gopsutil/mem",
-			"Comment": "1.0.0-146-g9c0474c",
-			"Rev": "9c0474c2a7cbea73ea2d93fc5e1ef1c024caf761"
+			"Comment": "1.0.0-148-ga369a88",
+			"Rev": "a369a8857c47ba9bcf8bbcf316897fa123d73639"
 		},
 		{
 			"ImportPath": "github.com/shirou/gopsutil/net",
-			"Comment": "1.0.0-146-g9c0474c",
-			"Rev": "9c0474c2a7cbea73ea2d93fc5e1ef1c024caf761"
+			"Comment": "1.0.0-148-ga369a88",
+			"Rev": "a369a8857c47ba9bcf8bbcf316897fa123d73639"
 		},
 		{
 			"ImportPath": "github.com/streadway/amqp",
diff --git a/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/disk_linux.go b/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/disk_linux.go
index d6c8cee7b..df59f6a90 100644
--- a/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/disk_linux.go
+++ b/Godeps/_workspace/src/github.com/shirou/gopsutil/disk/disk_linux.go
@@ -318,7 +318,7 @@ func GetDiskSerialNumber(name string) string {
 }
 
 func getFsType(stat syscall.Statfs_t) string {
-	t := stat.Type
+	t := int64(stat.Type)
 	ret, ok := fsTypeMap[t]
 	if !ok {
 		return ""
diff --git a/README.md b/README.md
index efba1e4be..fb833c85e 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,9 @@ plugins that Telegraf supports. See the
 [contributing guide](CONTRIBUTING.md) for instructions on
 writing new plugins.
 
+NOTE: Telegraf 0.1.9 will change the name of some cpu usage metrics, see
+[CHANGELOG](CHANGELOG.md) for more details.
+
 ## Installation:
 
 Due to a breaking change to the InfluxDB integer line-protocol, there