diff --git a/.cspell/pony-terms.txt b/.cspell/pony-terms.txt
new file mode 100644
index 00000000..27e60f88
--- /dev/null
+++ b/.cspell/pony-terms.txt
@@ -0,0 +1,23 @@
+Akka
+AOT
+deserialisation
+deserialise
+deserialised
+deserialising
+desugars
+docstrings
+finaliser
+finalisers
+forgeable
+LLDB
+parameterise
+Ponylang
+ponyc
+reraise
+struct
+structs
+subtyping
+unalias
+unaliased
+unaliasing
+Zulip
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index eed3b79d..9e739d2a 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -31,4 +31,8 @@ jobs:
       - name: Checkout source
         uses: actions/checkout@v4.1.1
       - name: Check spelling
-        uses: rojopolis/spellcheck-github-actions@e0dcc87bedf34ff10d6be443753f1c770bacbaa2
+        # streetsidesoftware/cspell-action v8.2.0
+        uses: streetsidesoftware/cspell-action@d5d910b521ad408f1e7383c24609079f5a88bdca
+        with:
+          use_cspell_files: true
+          incremental_files_only: false
diff --git a/.spellcheck.yml b/.spellcheck.yml
deleted file mode 100644
index 3df9715c..00000000
--- a/.spellcheck.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-matrix:
-- name: Markdown
-  aspell:
-    lang: en
-  dictionary:
-    wordlists:
-    - .spelling-wordlist.txt
-    encoding: utf-8
-  pipeline:
-  - pyspelling.filters.markdown:
-      markdown_extensions:
-      - markdown.extensions.extra:
-  - pyspelling.filters.html:
-      comments: true
-      attributes:
-      - title
-      - alt
-      ignores:
-      - ':matches(code, pre)'
-      - 'code'
-      - 'pre'
-
-  sources:
-  - 'docs/**/*.md'
-  default_encoding: utf-8
diff --git a/.spelling-wordlist.txt b/.spelling-wordlist.txt
deleted file mode 100644
index 9b45ba8d..00000000
--- a/.spelling-wordlist.txt
+++ /dev/null
@@ -1,89 +0,0 @@
-ABI
-AOT
-APIs
-Akka
-al
-arity
-bitwise
-boolean
-booleans
-capybaras
-combinators
-compilable
-dereference
-deserialise
-deserialised
-deserialisation
-deserialising
-desugars
-destructure
-docstring
-docstrings
-else's
-emptor
-encodings
-endian
-et
-FFI
-filesystem
-finaliser
-finalisers
-forgeable
-GC
-GDB
-Hypothesis
-interoperable
-invariants
-JIT
-JSON
-lexically
-LLDB
-LLVM
-Lua
-MacOS
-misremember
-mixins
-multibyte
-namespace
-OCaml
-ok
-ORCA
-polymorphism
-ponyc
-PonyCheck
-Ponylang
-PonyTest
-POSIX
-preprocessor
-QuickCheck
-Reddit
-reraise
-runtime
-ScalaCheck
-sendable
-sequentiality
-snuck
-substitutability
-substring
-subtype
-subtypes
-subtyping
-supertype
-struct
-structs
-TCP
-Theft
-TypeScript
-UDP
-unalias
-unaliased
-unaliasing
-unary
-unforgeable
-unhandled
-upcasts
-variadic
-Vimeo
-whitespace
-writeable
-Zulip
diff --git a/cspell.json b/cspell.json
new file mode 100644
index 00000000..6e048a71
--- /dev/null
+++ b/cspell.json
@@ -0,0 +1,32 @@
+{
+  "version": "0.2",
+  "language": "en",
+  "files": ["docs/**/*.md"],
+  "dictionaries": ["en-gb", "pony-terms"],
+  "dictionaryDefinitions": [
+    {
+      "name": "pony-terms",
+      "path": "./.cspell/pony-terms.txt",
+      "addWords": false
+    }
+  ],
+  "patterns": [
+    {
+      "name": "markdown-fenced-code",
+      "pattern": "/^(\\s*`{3,}).*[\\s\\S]*?^\\1/gm"
+    },
+    {
+      "name": "markdown-inline-code",
+      "pattern": "/`[^`]*`/g"
+    }
+  ],
+  "languageSettings": [
+    {
+      "languageId": "markdown",
+      "ignoreRegExpList": [
+        "markdown-fenced-code",
+        "markdown-inline-code"
+      ]
+    }
+  ]
+}