diff --git a/contrib/zsh/_transcrypt b/contrib/zsh/_transcrypt
index 7bed4a7..ec03ec5 100644
--- a/contrib/zsh/_transcrypt
+++ b/contrib/zsh/_transcrypt
@@ -6,26 +6,26 @@ _transcrypt() {
 
 	_arguments \
 		'(- 1 *)'{-l,--list}'[list encrypted files]' \
-		'(- 1 *)'{-s,--show-raw=}'[show raw file]:file:->file' \
-		'(- 1 *)'{-e,--export-gpg=}'[export config to gpg recipient]:recipient:' \
+		'(- 1 *)'{-s=,--show-raw=}'[show raw file]:file:->file' \
+		'(- 1 *)'{-e=,--export-gpg=}'[export config to gpg recipient]:recipient:' \
 		'(- 1 *)'{-v,--version}'[print version]' \
 		'(- 1 *)'{-h,--help}'[view help message]' \
-		'(-c --cipher -d --display -f --flush-credentials -u --uninstall)'{-c,--cipher=}'[specify encryption cipher]:cipher:->cipher' \
-		'(-p --password -d --display -f --flush-credentials -u --uninstall)'{-p,--password=}'[specify encryption password]:password:' \
+		'(-c --cipher -d --display -f --flush-credentials -u --uninstall)'{-c=,--cipher=}'[specify encryption cipher]:cipher:->cipher' \
+		'(-p --password -d --display -f --flush-credentials -u --uninstall)'{-p=,--password=}'[specify encryption password]:password:' \
 		'(-y --yes)'{-y,--yes}'[assume yes and accept defaults]' \
 		'(-d --display -p --password -c --cipher -r --rekey -u --uninstall)'{-d,--display}'[display current credentials]' \
 		'(-r --rekey -d --display -f --flush-credentials -u --uninstall)'{-r,--rekey}'[rekey all encrypted files]' \
 		'(-f --flush-credentials -c --cipher -p --password -r --rekey -u --uninstall)'{-f,--flush-credentials}'[flush cached credentials]' \
 		'(-F --force -d --display -u --uninstall)'{-F,--force}'[ignore repository clean state]' \
 		'(-u --uninstall -c --cipher -d --display -f --flush-credentials -p --password -r --rekey)'{-u,--uninstall}'[uninstall transcrypt]' \
-		'(--set-openssl-path -c --cipher -d --display -f --flush-credentials -p --password -r --rekey)'{--set-openssl-path}'[use OpenSSL at this path]' \
+		'(-set-openssl-path -c --cipher -d --display -f --flush-credentials -p --password -r --rekey)--set-openssl-path=[use OpenSSL at this path]:file:->file' \
 		'(--upgrade -c --cipher -d --display -f --flush-credentials -p --password -r --rekey)--upgrade[upgrade transcrypt]' \
-		'(-i --import-gpg -c --cipher -p --password -d --display -f --flush-credentials -u --uninstall)'{-i,--import-gpg=}'[import config from gpg file]:file:->file' \
+		'(-i --import-gpg -c --cipher -p --password -d --display -f --flush-credentials -u --uninstall)'{-i=,--import-gpg=}'[import config from gpg file]:file:->file' \
 		&& return 0
 
 	case $state in
 		cipher)
-			ciphers=( ${(f)"$(_call_program available-ciphers openssl list-cipher-commands)"} )
+			ciphers=( ${(f)"$(_call_program available-ciphers openssl list -cipher-commands)"} )
 			_describe -t available-ciphers 'available ciphers' ciphers
 			;;
 		file)