diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d6ecd18..0355c464 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,25 @@
+## Next
+
+- Added `teardown` command to turn off P9k prompt.
+- Fixes for P9k in Cygwin and 32-bit systems.
+- Better colors in virtualization segments.
+- Added 'Gopher' icon to the `go_version` segment.
+- Improved detection in `nvm`
+- Added option to support command status reading from piped command sequences.
+
+### New Segments: `host` and `user`
+
+Provides two separate segments for `host` and `user` in case you don't wont both
+in one (per the `context` segment).
+
+### New Segment: `newline`
+
+Allows you to split segments across multiple lines.
+
+### New Segment: `kubecontext`
+
+Shows the current context of your `kubectl` configuration.
+
 ## v0.6.4
 
 - Significant enhancements to the `battery` segment. Check out the README to
diff --git a/README.md b/README.md
index 890875ad..678cf0b9 100644
--- a/README.md
+++ b/README.md
@@ -138,6 +138,7 @@ The segments that are currently available are:
     * [`aws`](#aws) - The current AWS profile, if active.
     * `aws_eb_env` - The current Elastic Beanstalk Environment.
 * `docker_machine` - The current Docker Machine.
+* `kubecontext` - The current context of your `kubectl` configuration.
 
 **Other:**
 * [`custom_command`](#custom_command) - Create a custom segment to display the