diff --git a/README.md b/README.md
index d56e54e..45a2ada 100644
--- a/README.md
+++ b/README.md
@@ -56,27 +56,36 @@ Typically if you want to change the default `/usr/local` prefix:
 
 ### Tab completion
 
-Tab completion works with `bash` and `yash` (`zsh` is also supported if you enable `bashcompinit`).
+Tab completion works with `bash`, `zsh` and `yash`.
 Unfortunately, it doesn't work out of the box, you have to setup it manually.
 Luckily, it's super easy!
 
 Download the file corresponding to your shell:
- - [argz.bash](https://github.com/angt/argz/blob/dev/comp/argz.bash)
- - [argz.yash](https://github.com/angt/argz/blob/dev/comp/argz.yash)
 
-Then you can add these lines in your `.bashrc` (or `.zshrc`):
+ - [argz.bash](https://raw.githubusercontent.com/angt/argz/master/comp/argz.bash)
+ - [argz.yash](https://raw.githubusercontent.com/angt/argz/master/comp/argz.yash)
+ - [argz.zsh](https://raw.githubusercontent.com/angt/argz/master/comp/argz.zsh)
+
+Then, for `bash`, you can add these lines in your `.bashrc`:
+
+    . YOUR_PATH_TO/argz.bash
 
-    . argz.bash
     complete -F _argz secret
 
-Or in your `.yashrc`:
+For `yash`, in your `.yashrc`:
 
-    . argz.yash
+    . YOUR_PATH_TO/argz.yash
 
     function completion/secret {
         command -f completion//reexecute argz
     }
 
+And finally, for `zsh`, in your `.zshrc`:
+
+    . YOUR_PATH_TO/argz.zsh
+
+    compdef _argz secret
+
 Completion for secrets is only available in a trusted shell. See below.
 
 ## Commands
diff --git a/argz b/argz
index eb8b122..326e4c9 160000
--- a/argz
+++ b/argz
@@ -1 +1 @@
-Subproject commit eb8b122247bd48b11984ae4f8755ae6a4059e6c2
+Subproject commit 326e4c9f8b830aae4921a3a43c6a477027431408
diff --git a/libhydrogen b/libhydrogen
index a4de6e0..5c5d513 160000
--- a/libhydrogen
+++ b/libhydrogen
@@ -1 +1 @@
-Subproject commit a4de6e098b5bbbd5389eb8058130f782b53826c3
+Subproject commit 5c5d513093075f7245ea522101b17c50aa579af2