diff --git a/layers/+lang/major-modes/README.org b/layers/+lang/major-modes/README.org
index 802e58e5d..d2308ed38 100644
--- a/layers/+lang/major-modes/README.org
+++ b/layers/+lang/major-modes/README.org
@@ -2,11 +2,14 @@
 
 * Table of Contents                                         :TOC_4_gh:noexport:
 - [[#description][Description]]
+- [[#key-bindings][Key bindings]]
+  - [[#arch-linux-pkgbuilds][Arch Linux PKGBUILDs]]
 
 * Description
 This layer adds a number of packages for less common languages and major modes.
 
 These include:
+- Arch Linux PKGBUILDs
 - Arduino
 - Android Logcat (not associated with any file types by default)
 - Julia
@@ -16,3 +19,16 @@ These include:
 - Stan
 - Thrift
 - Wolfram Language / Mathematica
+
+* Key bindings
+
+** Arch Linux PKGBUILDs
+
+| Key Binding | Description                |
+|-------------+----------------------------|
+| ~SPC m b~   | Run makepkg                |
+| ~SPC m r~   | Increase the pkgrel number |
+| ~SPC m u~   | Browse URL                 |
+| ~SPC m m~   | Update package sums        |
+| ~SPC m e~   | Build ETAGS file           |
+| ~SPC m a~   | Make a source tarball      |
diff --git a/layers/+lang/major-modes/packages.el b/layers/+lang/major-modes/packages.el
index d8680dc5c..b41dd5c15 100644
--- a/layers/+lang/major-modes/packages.el
+++ b/layers/+lang/major-modes/packages.el
@@ -4,6 +4,7 @@
         julia-mode
         (logcat :location (recipe :fetcher github :repo "dcolascione/logcat-mode"))
         matlab-mode
+        pkgbuild-mode
         qml-mode
         scad-mode
         stan-mode
@@ -27,6 +28,20 @@
     ;; prog-mode major-mode
     (add-hook 'matlab-mode-hook 'spacemacs/run-prog-mode-hooks)))
 
+(defun major-modes/init-pkgbuild-mode ()
+  (use-package pkgbuild-mode
+    :mode ("\\`PKGBUILD\\'" . pkgbuild-mode)
+    :defer t
+    :init
+    (progn
+      (spacemacs/set-leader-keys-for-major-mode 'pkgbuild-mode
+        "r" 'pkgbuild-increase-release-tag
+        "b" 'pkgbuild-makepkg
+        "a" 'pkgbuild-tar
+        "u" 'pkgbuild-browse-url
+        "m" 'pkgbuild-update-sums-line
+        "e" 'pkgbuild-etags))))
+
 (defun major-modes/init-qml-mode ()
   (use-package qml-mode
     :defer t
diff --git a/layers/auto-layer.el b/layers/auto-layer.el
index 0e0bb8d76..29c81583c 100644
--- a/layers/auto-layer.el
+++ b/layers/auto-layer.el
@@ -84,6 +84,8 @@
 
 (configuration-layer/lazy-install 'php :extensions '("\\(\\.amk\\'\\|/Amkfile\\'\\|\\.phtml\\'\\|\\.php[s345t]?\\'\\|[^/]\\.\\(module\\|test\\|install\\|profile\\|tpl\\.php\\|theme\\|inc\\)\\'\\|\\.php\\'\\)" php-mode))
 
+(configuration-layer/lazy-install 'makepkg :extensions '("\\`PKGBUILD\\'" pkgbuild-mode))
+
 (configuration-layer/lazy-install 'purescript :extensions '("\\(\\.purs\\'\\)" purescript-mode))
 
 (configuration-layer/lazy-install 'python :extensions '("\\(\\.pyx\\'\\|\\.pxd\\'\\|\\.pxi\\'\\)" cython-mode))