diff --git a/cmd.go b/cmd.go
index d7cf6882..c82de8d1 100644
--- a/cmd.go
+++ b/cmd.go
@@ -41,6 +41,16 @@ Permanent configuration options:
     --save               Causes the following options to be saved back to the
                          config file when used
 
+    --builddir <dir>     Directory to use for building AUR Packages
+    --editor   <file>    Editor to use when editing PKGBUILDs
+    --makepkg  <file>    makepkg command to use
+    --pacman   <file>    pacman command to use
+    --tar      <file>    bsdtar command to use
+    --git      <file>    git command to use
+    --config   <file>    pacman.conf file to use
+
+    --requestsplitn <n>  Max amount of packages to query per AUR request
+
     --topdown            Shows repository's packages first and then AUR's
     --bottomup           Shows AUR's packages first and then repository's
     --devel              Check development packages during sysupgrade
@@ -52,7 +62,9 @@ Permanent configuration options:
     --redownload         Always download pkgbuilds of targets
     --redownloadall      Always download pkgbuilds of all AUR packages
     --noredownload       Skip pkgbuild download if in cache and up to date
-    --mflags             Pass arguments to makepkg
+    --mflags <flags>     Pass arguments to makepkg
+    --sudoloop           Loop sudo calls in the backgroud to avoid timeout
+    --nosudoloop         Do not loop sudo calls in the backgrount
 
 Print specific options:
     -c --complete        Used for completions
@@ -377,6 +389,23 @@ func handleConfig(option, value string) bool {
 		config.ReDownload = "no"
 	case "mflags":
 		config.MFlags = value
+	case "builddir":
+		config.BuildDir = value
+	case "editor":
+		config.Editor = value
+	case "makepkg":
+		config.MakepkgBin = value
+	case "pacman":
+		config.PacmanBin = value
+	case "tar":
+		config.TarBin = value
+	case "git":
+		config.GitBin = value
+	case "requestsplitn":
+		n, err := strconv.Atoi(value)
+		if err == nil && n > 0 {
+			config.RequestSplitN = n
+		}
 	default:
 		return false
 	}
diff --git a/parser.go b/parser.go
index 264614b1..6c421b49 100644
--- a/parser.go
+++ b/parser.go
@@ -412,6 +412,20 @@ func hasParam(arg string) bool {
 	//yay params
 	case "mflags":
 		return true
+	case "builddir":
+		return true
+	case "editor":
+		return true
+	case "makepkg":
+		return true
+	case "pacman":
+		return true
+	case "tar":
+		return true
+	case "git":
+		return true
+	case "requestsplitn":
+		return true
 	default:
 		return false
 	}
diff --git a/yay.8 b/yay.8
index c7dc3dff..602cdc7d 100644
--- a/yay.8
+++ b/yay.8
@@ -115,6 +115,56 @@ provides an easy way to change config options without directly editing the
 file\&.
 .RE
 .PP
+\fB\-\-builddir <dir>\fR
+.RS 4
+Directory to use for Building AUR Packages\&. This directory is also used as
+the AUR cache when deciding if Yay should should skip builds\&.
+.RE
+.PP
+\fB\-\-editor <file>\fR
+.RS 4
+Editor to use when editing PKGBUILDs\&. If this is not set the \fBEDITOR\fR
+environment variable will be checked, followed by \fBVISUAL\fR\&. If none of
+these are set Yay will prompt the user for an editor\&.
+.RE
+.PP
+\fB\-\-makepkg <file>\fR
+.RS 4
+The command to use for \fBmakepkg\fR calls. This can be a command in
+\fBPATH\fR or an absolute path to the file\&.
+.RE
+.PP
+\fB\-\-pacman <file>\fR
+.RS 4
+The command to use for \fBpacman\fR calls. This can be a command in
+\fBPATH\fR or an absolute path to the file\&.
+.RE
+.PP
+\fB\-\-tar <file>\fR
+.RS 4
+The command to use for \fBbsdtar\fR calls. This can be a command in
+\fBPATH\fR or an absolute path to the file\&.
+.RE
+.PP
+\fB\-\-git <file>\fR
+.RS 4
+The command to use for \fBgit\fR calls. This can be a command in
+\fBPATH\fR or an absolute path to the file\&.
+.RE
+.PP
+\fB\-\-config <file>\fR
+.RS 4
+The pacman config file to use\&.
+.RE
+.PP
+\fB\-\-requestsplitn <n>\fR
+.RS 4
+The maximum amount of packages to request per AUR query\&. The higher the
+number the faster AUR requests will be\&. Requesting too many packages in one
+AUR query will cause an error\%. This should only make a noticeable difference
+with very large requests (>500) packages\&.
+.RE
+.PP
 \fB\-\-topdown\fR
 .RS 4
 Display repository packages first and then AUR packages\&.
@@ -159,12 +209,12 @@ Do not consider build times during sysupgrade\&.
 .PP
 \fB\-\-redownload\fR
 .RS 4
-Always download pkgbuilds of targets even when a copy is avaliable in cache\&.
+Always download pkgbuilds of targets even when a copy is available in cache\&.
 .RE
 .PP
 \fB\-\-redownloadall\fR
 .RS 4
-Always download pkgbuilds of all AUR packages even when a copy is avaliable 
+Always download pkgbuilds of all AUR packages even when a copy is available
 in cache\&.
 .RE
 .PP
@@ -174,12 +224,23 @@ When downloading pkgbuilds if the pkgbuild is found in cache and is equal or
 newer than the AUR's version use that instead of downloading a new one\&.
 .RE
 .PP
-\fB\-\-mflags\fR
+\fB\-\-mflags <flags>\fR
 .RS 4
 Passes arguments to makepkg\&. These flags get passed to every instance where
 makepkg is called by Yay. Arguments are split on whitespace before being
-passed to makepkg. Multiple arguments may be passed by suplying a space
-seperated list that is quoted by the shell.
+passed to makepkg. Multiple arguments may be passed by supplying a space
+separated list that is quoted by the shell.
+.RE
+.PP
+\fB\-\-sudoloop\fR
+.RS 4
+Loop sudo calls in the background to prevent sudo from timing out during long
+builds\&.
+.RE
+.PP
+\fB\-\-noloop\fR
+.RS 4
+Do not loop sudo calls in the background\&.
 .RE
 .SH "EXAMPLES"
 .PP