diff --git a/.vscode/settings.json b/.vscode/settings.json
index b4a993ff7f3..8998f229f9f 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -108,5 +108,11 @@
         "zmin"
     ],
     "editor.formatOnType": true,
-    "esbonio.sphinx.confDir": ""
+    "esbonio.sphinx.confDir": "",
+    // Don't update the settings.json file with values inferred from Meson (we provide them manually)
+    "mesonbuild.modifySettings": false,
+    // Use the Meson build system for C/C++ files
+    "C_Cpp.default.configurationProvider": "mesonbuild.mesonbuild",
+    // Use the compile_commands.json file generated by Meson for IntelliSense
+    "C_Cpp.default.compileCommands": "${workspaceFolder}/builddir/compile_commands.json"
 }