diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in
index af3f8fc6..3ef4b8dc 100644
--- a/contrib/zsh_completion.in
+++ b/contrib/zsh_completion.in
@@ -604,8 +604,9 @@ _makepkg_shortopts=(
 	'-i[Install package after successful build]'
 	'-A[Ignore incomplete arch field in PKGBUILD]'
 	'-c[Clean up work files after build]'
+	'-C[Remove $srcdir/ dir before building the package]'
 	'-d[Skip all dependency checks]'
-	'-e[Do not extract source files (use existing src/ dir)]'
+	'-e[Do not extract source files (use existing $srcdir/ dir)]'
 	'-f[Overwrite existing package]'
 	'-g[Generate integrity checks for source files]'
 	'-h[Show help message and exit]'
@@ -616,6 +617,7 @@ _makepkg_shortopts=(
 	'-r[Remove installed dependencies after a successful build]'
 	'-R[Repackage contents of the package without rebuilding]'
 	'-S[Generate a source-only tarball without downloading sources]'
+	'-V[Show version information and exit]'
 )
 
 _makepkg_action_none(){
@@ -626,8 +628,9 @@ _makepkg_action_none(){
 _makepkg_longopts=(
 	'--ignorearch[Ignore incomplete arch field in PKGBUILD]'
 	'--clean[Clean up work files after build]'
+	'--cleanbuild[Remove $srcdir/ dir before building the package]'
 	'--nodeps[Skip all dependency checks]'
-	'--noextract[Do not extract source files (use existing src/ dir)]'
+	'--noextract[Do not extract source files (use existing $srcdir/ dir)]'
 	'--force[Overwrite existing package]'
 	'--geninteg[Generate integrity checks for source files]'
 	'--help[Show help message and exit]'
@@ -639,25 +642,27 @@ _makepkg_longopts=(
 	'--repackage[Repackage contents of the package without rebuilding]'
 	'--syncdeps[Install missing dependencies with pacman]'
 	'--source[Generate a source-only tarball without downloading sources]'
+	'--version[Show version information and exit]'
 	'--allsource[Generate a source-only tarball including downloaded source]'
 	'--check[Run check() function in the PKGBUILD]'
 	'--config[Use an alternate config file instead of '@sysconfdir@/makepkg.conf']: :_files'
-	'--holdver[Prevent automatic version bumping for development PKGBUILDs]'
+	'--holdver[Do not update VCS sources]'
 	'--key[Specify key to use for gpg signing instead of the default]: :_keys'
-	'--noarchive[Do not create the archive at the end of the build process]'
+	'--noarchive[Do not create package archive]'
 	'--nocheck[Do not run the check() function in the PKGBUILD]'
 	'--noprepare[Do not run the prepare() function in the PKGBUILD]'
 	'--nosign[Do not create a signature for the package]'
-	'--pkg[Only build listed packages from a split package]'
+	'--packagelist[Only list packages that would be produced, without PKGEXT]'
+	'--printsrcinfo[Print the generated SRCINFO and exit]'
 	'--sign[Sign the resulting package with gpg]'
 	'--skipchecksums[Do not verify checksums of the source files]'
 	'--skipinteg[do not perform any verification checks on source files]'
 	'--skippgpcheck[Do not verify source files with PGP signatures]'
-	'--noconfirm[do not ask for confirmation when resolving dependencies]'
+	'--noconfirm[Do not ask for confirmation when resolving dependencies]'
 	'--asdeps[Install packages as non-explicitly installed]'
 	'--noprogressbar[Do not show a progress bar when downloading files]'
-	'--needed[Do not reinstall up-to-date packages]'
-	'--verifysource[Only download sources and verify checksums]'
+	'--needed[Do not reinstall the targets that are already up to date]'
+	'--verifysource[Download source files (if needed) and perform integrity checks]'
 )
 _makepkg(){
 	case $words[CURRENT] in