diff --git a/bin/auto-pr.ps1 b/bin/auto-pr.ps1
index 0aef514a6..4717ec03e 100644
--- a/bin/auto-pr.ps1
+++ b/bin/auto-pr.ps1
@@ -1,51 +1,139 @@
+# Usage: .\bin\auto-pr.ps1 [options]
+# Summary: Updates manifests and pushes them or creates pull-requests
+# Help: Updates manifests and pushes them to directly the master branch or creates pull-requests for upstream
+#
+# Options:
+#   -p, --push                push updates directly to 'origin master'
+#   -r, --request             create pull-requests on 'upstream master' for each update
+#   -u, --upstream <upstream> upstream repository with target branch
+#                               only used if -r is set (default: lukesampson/scoop:master)
+
+param(
+    [String]$upstream = "lukesampson/scoop:master",
+    [Switch]$push = $false,
+    [Switch]$request = $false,
+    [Switch]$help = $false
+)
+
 . "$psscriptroot\..\lib\manifest.ps1"
 . "$psscriptroot\..\lib\json.ps1"
 
-Write-Host -f DarkCyan "Pulling current upstream master..."
-hub checkout master *> $null
-hub pull upstream master
-hub push origin master
-. "$psscriptroot\checkver.ps1" * -u
+if (!(scoop which hub)) {
+    Write-Host -f yellow "Please install hub (scoop install hub)"
+    exit 1
+}
 
-hub diff --name-only | % {
-    $manifest = $_
-    if($manifest.EndsWith('.json')) {
+if ((!$push -and !$request) -or $help) {
+    Write-Host ""
+    Write-Host "Usage: auto-pr.ps1 [OPTION]"
+    Write-Host ""
+    Write-Host "Mandatory options:"
+    Write-Host "  -p,  -push                       push updates directly to 'origin master'"
+    Write-Host "  -r,  -request                    create pull-requests on 'upstream master' for each update"
+    Write-Host ""
+    Write-Host "Optional options:"
+    Write-Host "  -u,  -upstream                   upstream repository with target branch"
+    Write-Host "                                     only used if -r is set (default: lukesampson/scoop:master)"
+    Write-Host "  -h,  -help"
+    Write-Host ""
+    exit 0
+}
 
-        $app = ([System.IO.Path]::GetFileNameWithoutExtension($manifest))
-        $json = parse_json $manifest
-        if($json.version) {
-            $version = $json.version
-            $homepage = $json.homepage
-            $branch = "manifest/$app-$version"
-            hub checkout master *> $null
-            hub rev-parse --verify $branch *> $null
-            if($LASTEXITCODE -gt 0) {
-                Write-Host -f DarkCyan "Creating update $app ($version) ..."
-                hub checkout -b $branch *> $null
-                hub add $manifest
-                hub commit -m "Update $app to version $version"
-                Write-Host -f DarkCyan "Pushing update $app ($version) ..."
-                hub push origin $branch
-                if($LASTEXITCODE -gt 0) {
-                    Write-Host -f DarkRed "Push failed! (hub push origin $branch)"
-                } else {
-                    Write-Host -f DarkCyan "Pull-Request update $app ($version) ..."
-                    hub pull-request -m "Update $app to version $version`n`nHello lovely humans,`n
+if(!($upstream -match "^(.*)\/(.*):(.*)$")) {
+    Write-Host -f DarkRed "Upstream must have this format: <user>/<repo>:<branch>"
+    exit 1
+}
+
+function execute($cmd) {
+    Write-Host -f Green $cmd
+    $output = iex $cmd
+
+    if($LASTEXITCODE -gt 0) {
+        Write-Host -f Red "^^^ Error! See above ^^^ (last command: $cmd)"
+        exit 1
+    }
+    return $output
+}
+
+function pull_requests($json, [String]$app, [String]$upstream)
+{
+    $version = $json.version
+    $homepage = $json.homepage
+    $branch = "manifest/$app-$version"
+
+    execute "hub checkout master"
+    execute "hub rev-parse --verify $branch"
+
+    if($LASTEXITCODE -eq 0) {
+        Write-Host -f Yellow "Skipping update $app ($version) ..."
+        return
+    }
+
+    Write-Host -f DarkCyan "Creating update $app ($version) ..."
+    execute "hub checkout -b $branch"
+    execute "hub add $manifest"
+    execute "hub commit -m 'Update $app to version $version'"
+    Write-Host -f DarkCyan "Pushing update $app ($version) ..."
+    execute "hub push origin $branch"
+
+    if($LASTEXITCODE -gt 0) {
+        Write-Host -f DarkRed "Push failed! (hub push origin $branch)"
+        return
+    }
+
+    Write-Host -f DarkCyan "Pull-Request update $app ($version) ..."
+    Write-Host -f green "hub pull-request -m '<msg>' -b '$upstream' -h $branch"
+    hub pull-request -m "Update $app to version $version`n`nHello lovely humans,`n
 a new version of [$app]($homepage) is available.
 <table>
 <tr><th align=left>State</th><td>Update :rocket:</td></tr>
 <tr><th align=left>New version</td><td>$version</td></tr>
-</table>" -b 'lukesampson/scoop:master' -h $branch
-                    if($LASTEXITCODE -gt 0) {
-                        Write-Host -f DarkRed "Pull Request failed! (hub pull-request -m 'update $app to version $version' -b 'lukesampson/scoop:master' -h $branch)"
-                    }
-                }
-            } else {
-                Write-Host -f DarkRed "Skipping update $app ($version) ..."
-            }
-        }
+</table>" -b '$upstream' -h $branch
+    if($LASTEXITCODE -gt 0) {
+        Write-Host -f DarkRed "Pull Request failed! (hub pull-request -m 'update $app to version $version' -b '$upstream' -h $branch)"
+        exit 1
     }
 }
 
-# return to master branch and remove unstaged files
-hub checkout -f master *> $null
+Write-Host -f DarkCyan "Updating ..."
+if($push -eq $true) {
+    execute("hub pull origin master")
+    execute "hub checkout master"
+} else {
+    execute("hub pull upstream master")
+    execute("hub push origin master")
+}
+
+. "$psscriptroot\checkver.ps1" * -u
+
+hub diff --name-only | % {
+    $manifest = $_
+    if(!$manifest.EndsWith(".json")) {
+        return
+    }
+
+    $app = ([System.IO.Path]::GetFileNameWithoutExtension($manifest))
+    $json = parse_json $manifest
+    if(!$json.version) {
+        Write-Host -f Red "Invalid manifest: $manifest ..."
+        return
+    }
+    $version = $json.version
+
+    if($push -eq $true) {
+        Write-Host -f DarkCyan "Creating update $app ($version) ..."
+        execute "hub add $manifest"
+        execute "hub commit -m 'Update $app to version $version'"
+    } else {
+        pull_requests $json $app $upstream
+    }
+}
+
+if($push -eq $true) {
+    Write-Host -f DarkCyan "Pushing update $app ($version) ..."
+    execute "hub push origin master"
+} else {
+    Write-Host -f DarkCyan "returning to master branch and removing unstaged files ..."
+    # execute "hub checkout -f master"
+}
+