diff --git a/.travis.yml b/.travis.yml
index 6da7bb33c9f9..f3aac34e9491 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,4 +28,5 @@ after_success:
     travis-cargo --only stable coveralls --no-sudo -- --features yaml
 env:
   global:
-    secure: JLBlgHY6OEmhJ8woewNJHmuBokTNUv7/WvLkJGV8xk0t6bXBwSU0jNloXwlH7FiQTc4TccX0PumPDD4MrMgxIAVFPmmmlQOCmdpYP4tqZJ8xo189E5zk8lKF5OyaVYCs5SMmFC3cxCsKjfwGIexNu3ck5Uhwe9jI0tqgkgM3URA=
+    - TRAVIS_CARGO_NIGHTLY_FEATURE=travis
+    - secure: JLBlgHY6OEmhJ8woewNJHmuBokTNUv7/WvLkJGV8xk0t6bXBwSU0jNloXwlH7FiQTc4TccX0PumPDD4MrMgxIAVFPmmmlQOCmdpYP4tqZJ8xo189E5zk8lKF5OyaVYCs5SMmFC3cxCsKjfwGIexNu3ck5Uhwe9jI0tqgkgM3URA=
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 453f253edd7c..ae97c15f4119 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -72,6 +72,7 @@
  * **There is now a priority of order to determine the name** - This is perhaps the biggest breaking change. See the documentation for full details. Prior to this change, the value name took precedence. **Ensure your args are using the proper names (i.e. typically the long or short and NOT the value name) throughout the code**
 * `ArgMatches::values_of` returns an `Values` now which implements `Iterator` (should not break any code)
 * `crate_version!` returns `&'static str` instead of `String`
+* Using the `clap_app!` macro requires compiling with the `unstable` feature because the syntax could change slightly in the future
 
 
 <a name="v1.5.5"></a>
diff --git a/Cargo.toml b/Cargo.toml
index 3426acc0ffb3..e977afbc94b6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "clap"
-version = "2.0.0"
+version = "2.0.1"
 authors = ["Kevin K. <kbknapp@gmail.com>"]
 exclude = ["examples/*", "clap-tests/*", "tests/*", "benches/*", "*.png", "clap-perf/*"]
 description = "A simple to use, efficient, and full featured  Command Line Argument Parser"
@@ -26,8 +26,9 @@ color       = ["ansi_term"]
 yaml        = ["yaml-rust"]
 lints       = ["clippy", "nightly"]
 nightly     = [] # for building with nightly and unstable features
-unstable    = ["lints", "nightly"] # for building with travis-cargo
+unstable    = [] # for building with unstable features on stable Rust
 debug       = [] # for building with debug messages
+travis      = ["lints", "nightly"] # for building with travis-cargo
 
 [profile.release]
 opt-level = 3
diff --git a/README.md b/README.md
index 049749b68154..cd55f81787bc 100644
--- a/README.md
+++ b/README.md
@@ -103,6 +103,7 @@ Below is a list of breaking changes between 1.x and 2.x and how you can change y
  * **There is now a priority of order to determine the name** - This is perhaps the biggest breaking change. See the documentation for full details. Prior to this change, the value name took precedence. **Ensure your args are using the proper names (i.e. typically the long or short and NOT the value name) throughout the code**
 * `ArgMatches::values_of` returns an `Values` now which implements `Iterator` (should not break any code)
 * `crate_version!` returns `&'static str` instead of `String`
+* Using the `clap_app!` macro requires compiling with the `unstable` feature because the syntax could change slightly in the future
 
 For full details, see [CHANGELOG.md](https://github.com/kbknapp/clap-rs/blob/master/CHANGELOG.md)
 
@@ -602,6 +603,7 @@ As of 2.0.0 (From 1.x)
  * **There is now a priority of order to determine the name** - This is perhaps the biggest breaking change. See the documentation for full details. Prior to this change, the value name took precedence. **Ensure your args are using the proper names (i.e. typically the long or short and NOT the value name) throughout the code**
 * `ArgMatches::values_of` returns an `Values` now which implements `Iterator` (should not break any code)
 * `crate_version!` returns `&'static str` instead of `String`
+* Using the `clap_app!` macro requires compiling with the `unstable` feature because the syntax could change slightly in the future
 
 ### Deprecations