diff --git a/src/_httpie b/src/_httpie
index 4d702ef..442c138 100644
--- a/src/_httpie
+++ b/src/_httpie
@@ -37,11 +37,9 @@
 #  * Akira Maeda <https://github.com/glidenote>
 #  * Valodim <https://github.com/Valodim>
 #  * Claus Klingberg <https://github.com/cjk>
+#  * Shohei YOSHIDA <https://github.com/syohex>
 #
 # ------------------------------------------------------------------------------
-# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
-# vim: ft=zsh sw=2 ts=2 et
-# ------------------------------------------------------------------------------
 
 _httpie_params () {
 
@@ -153,12 +151,15 @@ integer NORMARG
 _arguments -n -C -s \
   '(-j --json -f)'{-j,--json}'[Data items from the command line are serialized as a JSON object.]' \
   '(-f --form -j)'{-f,--form}'[Data items from the command line are serialized as form fields.]' \
+  '(-x --compress)'{-x,--compress}'[Content compressed with Deflate algorithm]' \
   '--pretty=[Controls output processing.]:output format:(all colors format none)' \
   '(-s --style)'{-s,--style}'=[Output coloring style]:STYLE:(autumn borland bw colorful default emacs friendly fruity manni monokai murphy native pastie perldoc ttr solarized tango trac vim vs)' \
   '(-p --print)'{-p,--print}'=[String specifying what the output should contain]:print flags:_httpie_printflags' \
   '(-v --verbose)'{-v,--verbose}'[Print the whole request as well as the response.]' \
   '(-p -h --headers)'{-h,--headers}'[Print only the response headers.]' \
   '(-p -b --body)'{-b,--body}'[Print only the response body.]' \
+  '--all[By default, only the final request/response is shown]' \
+  '(--P --history-print)'{-P,--history-print}'=[The same as --print but applies only to intermediary requests/response]:print flags:_httpie_printflags' \
   '(-S --stream)'{-S,--stream}'[Always stream the output by line, i.e., behave like `tail -f`.]' \
   '(-o --output)'{-o,--output}'=[Save output to FILE.]:output file:_files' \
   '(-d --download)'{-d,--download}'=[Do not print the response body to stdout.]' \
@@ -167,15 +168,32 @@ _arguments -n -C -s \
   '(--session)--session-read-only=[Create or read a session without updating it form the request/response exchange.]:session name (or path)' \
   '(-a --auth)'{-a,--auth}'=[If only the username is provided (-a username)]:USER\:PASS' \
   '--auth-type=[The authentication mechanism to be used. Defaults to "basic".]:AUTH-TYPE:(basic digest)' \
+  '--ignore-netrc[Ignore credentials from .netrc]' \
+  '--offline[Build the request and print it but do not actually send it]' \
   '--proxy=[String mapping protocol to the URL of the proxy.]:PROXY' \
-  '--follow[Allow full redirects.]' \
+  '(-F --follow)'{-F,--follow}'[Allow full redirects.]' \
+  '--max-redirects=[A limit of redirects]:number:' \
+  '--max-headers=[The maximum number of response headers to be read]:number:' \
   "--verify=[Enable or disable verification of ssl certificates.]:verify certificate:(yes no)" \
+  '--ssl=[The desired protocol version to use]:ssl version:(ssl2.3 tls1 tls1.1 tls1.2)' \
+  '--cert=[Specify a local cert to use as client side SSL certificate]:cert:_files' \
+  '--cert-key=[Specify the private to key to use with SSL]:cert key:_files' \
   '--allow-redirects[Set this flag if full redirects are allowed (e.g. re-POST-ing of data at new ``Location``)]' \
   '--timeout=[Float describes the timeout of the request (Use socket.setdefaulttimeout() as fallback).]:timeout (seconds)' \
   '--check-status[This flag instructs HTTPie to also check the HTTP status code and exit with an error if the status indicates one.]' \
-  '--ignore-stdin[Do not attempt to read stdin.]' \
+  '--path-as-is[Bypass dot segment URL squashing]' \
+  '(-I --ignore-stdin)'{-I,--ignore-stdin}'[Do not attempt to read stdin.]' \
   '(- *)--help[show help message.]' \
   "(- *)--version[show program's version number and exit.]" \
   '--traceback[Prints exception traceback should one occur.]' \
+  '--default-scheme=[The default scheme to use if not specified in the URL]:scheme:' \
   '--debug[Prints exception traceback should one occur and other information useful for debugging HTTPie itself.]' \
   '*:args:_httpie_params' && return 0
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et