diff --git a/Makefile b/Makefile
index 8b3a451d1d..d97c834999 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: clean help deps regen-apis license ubuntu-build
+.PHONY: help deps regen-apis license ubuntu-build wheezy-build clean
 .SUFFIXES:
 
 VENV = .virtualenv/virtualenv.py
@@ -86,6 +86,6 @@ wheezy-build:
 
 regen-apis: | clean-all-api clean-all-cli gen-all-api gen-all-cli license
 
-clean: clean-all-api clean-all-cli
+clean: clean-all-api clean-all-cli docs-all-clean
 	-rm -Rf $(VENV_DIR)
 	-rm $(API_DEPS) $(CLI_DEPS)
diff --git a/etc/api/type-cli.yaml b/etc/api/type-cli.yaml
index 43009c3078..7232a6f01d 100644
--- a/etc/api/type-cli.yaml
+++ b/etc/api/type-cli.yaml
@@ -27,9 +27,5 @@ cargo:
   is_executable: YES
   dependencies:
     - strsim = "*"
-    - clap = "*"
-    - |
-      [dependencies.yup-hyper-mock]
-        version = "*"
-        git = "https://github.com/Byron/yup-hyper-mock"
-        rev = "ee56de4dead136b3ca5a3eda6ca7057f9074e261"
+    - yup-hyper-mock = ">=1.0.0"
+    - clap = ">= 0.9.1"
diff --git a/src/mako/Cargo.toml.mako b/src/mako/Cargo.toml.mako
index 7366eb6570..36da136bed 100644
--- a/src/mako/Cargo.toml.mako
+++ b/src/mako/Cargo.toml.mako
@@ -23,25 +23,19 @@ name = "${util.program_name()}"
 % endif
 
 [dependencies]
+hyper = ">= 0.5.0"
 mime = "*"
-
 serde = ">= 0.3.0"
 serde_macros = "*"
 % for dep in cargo.get('dependencies', list()):
 ${dep}
 % endfor
 
-# Needed for latest fix in macros !
-[dependencies.hyper]
-version = ">= 0.4.0"
-git = "https://github.com/hyperium/hyper"
-rev = "871f37a5605d433e5699ed2f16631001d86d7805"
-
 # to adapt to hyper changes ... 
 [dependencies.yup-oauth2]
 version = "*"
 git = "https://github.com/Byron/yup-oauth2"
-rev = "94d5b7c2cac02ad67da8504504364b3081a9a866"
+rev = "598f5ed496077e9edca36ff95e2ab352c5b22d0f"
 
 % if make.depends_on_suffix is not None:
 
diff --git a/src/mako/cli/lib/argparse.mako b/src/mako/cli/lib/argparse.mako
index 2c2ae7cfcb..d4f7afc356 100644
--- a/src/mako/cli/lib/argparse.mako
+++ b/src/mako/cli/lib/argparse.mako
@@ -272,7 +272,8 @@ for &(main_command_name, ref about, ref subcommands) in arg_data.iter() {
                         (_        , &Some(f)) => f,
                          _                    => unreachable!(),
                  };
-            let mut arg = Arg::with_name(arg_name_str);
+            let mut arg = Arg::with_name(arg_name_str)
+                              .empty_values(false);
             if let &Some(short_flag) = flag {
                 arg = arg.short(short_flag);
             }
diff --git a/src/mako/deps.mako b/src/mako/deps.mako
index cb8e6819c2..9596689d5b 100644
--- a/src/mako/deps.mako
+++ b/src/mako/deps.mako
@@ -132,7 +132,7 @@ ${api_clean}:
 % endfor
 % endfor
 
-clean-all${agsuffix}: ${space_join(1)} docs-clean${agsuffix}
+clean-all${agsuffix}: ${space_join(1)}
 cargo${agsuffix}: ${space_join(2)}
 publish${agsuffix}: | gen-all${agsuffix} ${space_join(4)}
 gen-all${agsuffix}: ${space_join(0)}
@@ -159,6 +159,7 @@ docs${agsuffix}: ${' '.join(central_api_index(util.library_to_crate_name(a[0]))
 
 help${agsuffix}:
 	$(info gen-all${agsuffix}       -   make all ${make.target_name})
+	$(info docs${agsuffix}          -   make all ${make.target_name} documentation)
 	$(info clean-all${agsuffix}     -   delete all generated ${make.target_name})
 	$(info cargo${agsuffix}         -   run cargo on all ${make.target_name}, use ARGS="args ..." to specify cargo arguments)
 	$(info publish${agsuffix}       -   run cargo publish on all ${make.target_name} and remember successful ones with marker files)