diff --git a/meson.build b/meson.build
index b15480cda..86e4caf27 100644
--- a/meson.build
+++ b/meson.build
@@ -13,6 +13,7 @@ if not cc.has_argument('-print-file-name=libc.so')
   error('C compiler does not support the -print-file-name argument.')
 endif
 
+codespell = find_program('codespell', required: false)
 go = find_program('go')
 go_md2man = find_program('go-md2man')
 shellcheck = find_program('shellcheck', required: false)
@@ -57,6 +58,10 @@ if shellcheck.found()
   test('shellcheck toolbox (deprecated)', shellcheck, args: [toolbox_sh])
 endif
 
+if codespell.found()
+  test('codespell toolbox', codespell, args: ['--skip', meson.project_build_root(), meson.source_root()])
+endif
+
 if not skopeo.found()
     message('Running system tests requires Skopeo for OCI image manipulation.')
 endif
diff --git a/playbooks/dependencies.yaml b/playbooks/dependencies.yaml
index 392bdaac0..a171fb7c7 100644
--- a/playbooks/dependencies.yaml
+++ b/playbooks/dependencies.yaml
@@ -6,6 +6,7 @@
       - ShellCheck
       - bash-completion
       - bats
+      - codespell
       - flatpak-session-helper
       - golang
       - golang-github-cpuguy83-md2man