diff --git a/completions/bash b/completions/bash
index 6e9a4d89..cbc7c8cf 100644
--- a/completions/bash
+++ b/completions/bash
@@ -70,7 +70,9 @@ _yay() {
   common=('arch cachedir color config confirm dbpath debug gpgdir help hookdir logfile
            noconfirm noprogressbar noscriptlet quiet save mflags buildir editor
            makepkg pacman tar git gpg gpgflags config requestsplitn sudoloop nosudoloop
-           redownload noredownload redownloadall rebuild rebuildall rebuildtree norebuild root verbose' 'b d h q r v')
+           redownload noredownload redownloadall rebuild rebuildall rebuildtree norebuild
+	   sortby answerclean answeredit answerupgrade noanswerclean noansweredit
+	   noanswerupgrade root verbose' 'b d h q r v')
   core=('database files help query remove sync upgrade version' 'D F Q R S U V h')
 
   for o in 'D database' 'F files' 'Q query' 'R remove' 'S sync' 'U upgrade' 'Y yays' 'P print'; do
diff --git a/completions/zsh b/completions/zsh
index 51757e1b..b3ea841f 100644
--- a/completions/zsh
+++ b/completions/zsh
@@ -49,6 +49,15 @@ _pacman_opts_common=(
   '--git[git command to use]:git:_files'
   '--gpg[gpg command to use]:gpg:_files'
 
+  '--sortby[Sort AUR results by a specific field during search]:sortby options:(votes popularity id baseid name base submitted modified)'
+  '--answerclean[Set a predetermined answer for the clean build menu]:answer'
+  '--answeredit[Set a predetermined answer for the edit pkgbuild menu]:answer'
+  '--answerupgrade[Set a predetermined answer for the upgrade menu]:answe'
+  '--noanswerclean[Unset the answer for the clean build menu]'
+  '--noansweredit[Unset the answer for the edit pkgbuild menu]'
+  '--noanswerupgrade[Unset the answer for the upgrade menu]'
+
+
   '--bottomup[Show AUR packages first]'
   '--topdown[Show repository packages first]'
   '--devel[Check -git/-svn/-hg development version]'