diff --git a/.github/workflows/build-amd64.yml b/.github/workflows/build-amd64.yml
index 931d7a8..cf1f096 100644
--- a/.github/workflows/build-amd64.yml
+++ b/.github/workflows/build-amd64.yml
@@ -11,7 +11,7 @@ jobs:
   build:
     strategy:
       matrix:
-        clang-version: [ 7, 8, 9, 10, 11, 12, 12.0.1, 13, 14, 15, 16, 17 ]
+        clang-version: [ 7, 8, 9, 10, 11, 12, 12.0.1, 13, 14, 15, 16, 17, 18 ]
         os: [ linux, macosx, windows ]
         include:
           - clang-version: 7
@@ -41,6 +41,8 @@ jobs:
             release: llvm-project-16.0.3.src
           - clang-version: 17
             release: llvm-project-17.0.4.src
+          - clang-version: 18
+            release: llvm-project-18.1.0.src
           - os: linux
             runner: ubuntu-22.04
             os-cmake-args: '-DLLVM_BUILD_STATIC=ON -DCMAKE_CXX_FLAGS="-s -flto" ${POSIX_CMAKE_ARGS}'
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2c733a0..7248e9d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        clang-version: [ 7, 8, 9, 10, 11, 12, 12.0.1, 13, 14, 15, 16, 17 ]
+        clang-version: [ 7, 8, 9, 10, 11, 12, 12.0.1, 13, 14, 15, 16, 17, 18 ]
         os: [ ubuntu-latest, macos-latest, windows-latest ]
         include:
           - os: ubuntu-latest
diff --git a/README.md b/README.md
index 540cdc0..79ce71e 100644
--- a/README.md
+++ b/README.md
@@ -8,11 +8,11 @@ Includes clang-format, clang-tidy, clang-query and clang-apply-replacements.
 
 The supported versions are as follows:
 
-|OS/Version |17|16|15|14|13|12|11|10|9|8|7|
-|---|---|---|---|---|---|---|---|---|---|---|---|
-|Linux 64|✔️|✔️|✔️|✔️|✔️|✔️|✔️|✔️| ✔️|✔️|✔️|✔️|    
-|Window 64|✔️|✔️|✔️|✔️|✔️|✔️|✔️|✔️| ✔️|✔️|✔️|✔️|
-|macOS 64|✔️|✔️|✔️|✔️|✔️|✔️|✔️|✔️| ✔️|✔️|✔️|✔️|
+|OS/Version |18 |17 |16 |15 |14 |13 |12 |11 |10 |9  |8  |7  |
+|-----------|---|---|---|---|---|---|---|---|---|---|---|---|
+|Linux 64   |✔️ |✔️|✔️|✔️ |✔️|✔️ |✔️ |✔️|✔️| ✔️|✔️|✔️ |    
+|Window 64  |✔️ |✔️|✔️|✔️ |✔️|✔️ |✔️ |✔️|✔️| ✔️|✔️|✔️ |
+|macOS 64   |✔️ |✔️|✔️|✔️ |✔️|✔️ |✔️ |✔️|✔️| ✔️|✔️|✔️ |
 
 ## Download