diff --git a/.travis.yml b/.travis.yml
index 6da7bb33c9f..398862e28dc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,12 +10,13 @@ before_script:
     export PATH=$HOME/.local/bin:$PATH
 script:
   - |
-    cargo build --features yaml &&
-    cargo test --features yaml &&
+    cargo build --verbose --no-default-features &&
+    cargo build --verbose --features yaml &&
+    cargo test --verbose --features yaml &&
     make -C clap-tests test &&
-    travis-cargo --only stable doc -- --features yaml &&
+    travis-cargo --only nightly build -- --features travis &&
     travis-cargo --only nightly bench &&
-    cargo build --no-default-features
+    travis-cargo --only stable doc -- --features yaml
 addons:
   apt:
     packages:
@@ -28,4 +29,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 453f253edd7..e30fcd1adf5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+<a name="v2.0.1"></a>
+### v2.0.1 (2016-01-30)
+
+
+#### Bug Fixes
+
+*   fixes cargo features to NOT require nightly with unstable features ([dcbcc60c](https://github.com/kbknapp/clap-rs/commit/dcbcc60c9ba17894be636472ea4b07a82d86a9db), closes [#402](https://github.com/kbknapp/clap-rs/issues/402))
+
+
 <a name="v2.0.0"></a>
 ## v2.0.0 (2016-01-28)
 
@@ -72,6 +81,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 3426acc0ffb..e977afbc94b 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 049749b6815..cd55f81787b 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