diff --git a/easybuild/easyblocks/a/aocc.py b/easybuild/easyblocks/a/aocc.py
index ff33673afb..8dfb590e74 100644
--- a/easybuild/easyblocks/a/aocc.py
+++ b/easybuild/easyblocks/a/aocc.py
@@ -73,6 +73,9 @@ def _aocc_guess_clang_version(self):
             '3.0.0': '12.0.0',
             '3.1.0': '12.0.0',
             '3.2.0': '13.0.0',
+            '4.0.0': '14.0.6',
+            '4.1.0': '16.0.3',
+            '4.2.0': '16.0.3',
         }
 
         if self.version in map_aocc_to_clang_ver:
@@ -138,6 +141,12 @@ def create_wrapper(wrapper_comp):
 
     def sanity_check_step(self):
         """Custom sanity check for AOCC, based on sanity check for Clang."""
+
+        # Clang v16+ only use the major version number for the resource dir
+        resdir_version = self.clangversion
+        if self.clangversion >= '16':
+            resdir_version = LooseVersion(self.clangversion).version[0]
+
         shlib_ext = get_shared_lib_ext()
         custom_paths = {
             'files': [
@@ -147,7 +156,7 @@ def sanity_check_step(self):
                 'lib/clang/%s/include/stddef.h' % self.clangversion, 'lib/libclang.%s' % shlib_ext,
                 'lib/libomp.%s' % shlib_ext,
             ],
-            'dirs': ['include/llvm', 'lib/clang/%s/lib' % self.clangversion, 'lib32'],
+            'dirs': ['include/llvm', 'lib/clang/%s/lib' % resdir_version, 'lib32'],
         }
 
         custom_commands = [