diff --git a/arch/requirements.yml b/arch/requirements.yml
new file mode 100644
index 0000000..381e077
--- /dev/null
+++ b/arch/requirements.yml
@@ -0,0 +1 @@
+- src: kewlfft.aur
diff --git a/arch/roles/dotfiles/tasks/main.yml b/arch/roles/dotfiles/tasks/main.yml
index 52cb3b2..22ad124 100644
--- a/arch/roles/dotfiles/tasks/main.yml
+++ b/arch/roles/dotfiles/tasks/main.yml
@@ -15,3 +15,10 @@
   command:
     chdir: "{{ ansible_env.HOME }}/dotfiles"
     cmd: "stow bash"
+    creates: "~/.bashrc"
+
+- name: Stow GPG config
+  command:
+    chdir: "{{ ansible_env.HOME }}/dotfiles"
+    cmd: "stow gnupg"
+    creates: "~/.gnupg/gpg.conf"
diff --git a/arch/roles/stumpwm/meta/main.yml b/arch/roles/stumpwm/meta/main.yml
new file mode 100644
index 0000000..2ffd04b
--- /dev/null
+++ b/arch/roles/stumpwm/meta/main.yml
@@ -0,0 +1,3 @@
+dependencies:
+  - kewlfft.aur
+  - gui
diff --git a/arch/roles/stumpwm/tasks/main.yml b/arch/roles/stumpwm/tasks/main.yml
new file mode 100644
index 0000000..2520f0b
--- /dev/null
+++ b/arch/roles/stumpwm/tasks/main.yml
@@ -0,0 +1,38 @@
+- name: Install Pacman packages
+  become: yes
+  pacman:
+    name:
+      - sbcl
+      - ttf-fira-mono
+    state: present
+
+- name: Stow CL configuration
+  command:
+    chdir: "{{ ansible_env.HOME }}/dotfiles"
+    cmd: "stow common-lisp"
+    creates: "~/.sbclrc"
+
+- name: Install AUR packages
+  aur:
+    name:
+      - cl-alexandria-git
+      - clx-git
+      - cl-ppcre
+      - slime
+      - quicklisp
+      - stumpwm
+
+- name: Stow StumpWM configuration
+  command:
+    chdir: "{{ ansible_env.HOME }}/dotfiles"
+    cmd: "stow stumpwm"
+    creates: "~/.stumpwm.d/init.lisp"
+
+- name: Install swank
+  command:
+    cmd: "sbcl --non-interactive --eval '(ql:quickload \"swank\")'"
+
+- name: Clone contrib modules
+  git:
+    repo: "https://github.com/stumpwm/stumpwm-contrib.git"
+    dest: "~/.stumpwm.d/contrib"
diff --git a/arch/roles/toolbox/tasks/main.yml b/arch/roles/toolbox/tasks/main.yml
index 0d4d4c3..0b715aa 100644
--- a/arch/roles/toolbox/tasks/main.yml
+++ b/arch/roles/toolbox/tasks/main.yml
@@ -5,8 +5,10 @@
       - gcc
       - make
       - cmake
+      - autoconf
       - which
       - git
       - w3m
       - gnupg
+      - fakeroot
     state: present
diff --git a/arch/workstation.yml b/arch/workstation.yml
index e6355d7..512d2f8 100644
--- a/arch/workstation.yml
+++ b/arch/workstation.yml
@@ -1,15 +1,10 @@
 - hosts: localhost
   connection: local
-  tasks:
-    - import_role:
-        name: base
-    - import_role:
-        name: dotfiles
-    - import_role:
-        name: toolbox
-    - import_role:
-        name: password_store
-    - import_role:
-        name: emacs
-    - import_role:
-        name: gui
+  roles:
+    - base
+    - dotfiles
+    - toolbox
+    - password_store
+    - emacs
+    - gui
+    - stumpwm