diff --git a/PKGBUILD b/PKGBUILD
index 7d7d47d..18f2b9f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,32 +2,33 @@
 # Contributor: Tim Meusel <tim@bastelfreak.de>
 # Contributor: Sebastian Rakel <sebastian@devunit.eu>
 # Contributor: Justin Kromlinger <hashworks@archlinux.org>
+# Contributor: Andrew Tyler <assimilat@gmail.com>
 
 pkgname='vault'
 pkgdesc='A tool for managing secrets'
-pkgver=1.9.0
+pkgver=1.9.1
 pkgrel=1
 url="https://vaultproject.io/"
 license=('MPL')
 arch=('x86_64')
 makedepends=('go' 'git' 'yarn' 'bower' 'nodejs-lts-fermium' 'npm' 'zip'
-'go-bindata-hashicorp' 'go-bindata-assetfs' 'gox' 'go-tools')
+  'go-bindata-hashicorp' 'go-bindata-assetfs' 'gox' 'go-tools')
 depends=('glibc')
 install='vault.install'
 backup=('etc/vault.hcl')
-_vault_commit='6dae166b52e0d65147991d143045ad929eb3d71b'
+_vault_commit='3d69cbbd35a8e7a51bd036849f39a7fd0eb9c2ca'
 source=("git+https://github.com/hashicorp/vault#commit=${_vault_commit}"
-        'vault.service'
-        'vault.sysusers'
-        'vault.tmpfiles'
-        'vault.hcl')
+  'vault.service'
+  'vault.sysusers'
+  'vault.tmpfiles'
+  'vault.hcl')
 sha512sums=('SKIP'
             '6619cf57668e995cddb29fb6c388c18c21b251052a53832415e415bb4fe538361ef77b74536f5b082b9cda6cd71b598fc50d8b7f51092c4d60262052c5725af2'
             '92616ccf83fa5ca9f8b0d022cf8ceb1f3549e12b66bf21d9f77f3eb26bd75ec1dc36c155948ec987c642067b85fbfc30a9217d6c503d952a402aa5ef63e50928'
             '073f0f400cba78521cd2709ce86d88fbb14125117f9f3beca657f625d04eab8e00f7a01b5d9a1cfc03e9038844f5732bdbb1a85dd65a803d3f0b90f8bf87880e'
             '46106cc76151eef2dd5e4b2caa6a96aae4d6ce1ecbf977dcc8667a3f6c829cbea95133622adafcb15cdfaa066ecc94c73c983e7613ee2f6573694981569729fe')
 
-prepare () {
+prepare() {
   export GOPATH="${srcdir}"
   mkdir -p src/github.com/hashicorp/ "$GOPATH/bin"
   mv "${pkgname}" "src/github.com/hashicorp/${pkgname}"
@@ -42,17 +43,21 @@ pkgver() {
   git describe --tags --match 'v*' | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-build () {
+build() {
   cd $PACKAGE_ROOT
   export CGO_CPPFLAGS="${CPPFLAGS}"
   export CGO_CFLAGS="${CFLAGS}"
   export CGO_CXXFLAGS="${CXXFLAGS}"
   export CGO_LDFLAGS="${LDFLAGS}"
   export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
-  XC_OSARCH='linux/amd64' make static-dist bin
+  export XC_OSARCH='linux/amd64'
+  grep "^[a-z].*plugin[:]" Makefile | cut -f1 -d: | while IFS= read -r plugin; do
+    make "$plugin"
+  done
+  make static-dist bin
 }
 
-package () {
+package() {
   cd ${PACKAGE_ROOT}
   install -Dm755 bin/vault "${pkgdir}/usr/bin/vault"
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"