diff --git a/.editorconfig b/.editorconfig
index 3c6b234f182..00340ec1324 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -31,7 +31,7 @@ indent_size = 3
 [*.patch]
 trim_trailing_whitespace = false
 
-[{meson.build,meson_options.txt}]
+[{meson.build,meson.options}]
 indent_style = space
 indent_size = 2
 
diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml
index e1c897110af..50f2dd1fb78 100644
--- a/.gitlab-ci/test-source-dep.yml
+++ b/.gitlab-ci/test-source-dep.yml
@@ -55,7 +55,7 @@
         - .gitlab-ci/**/*
         - include/**/*
         - meson.build
-        - meson_options.txt
+        - meson.options
         - build-support/**/*
         - subprojects/**/*
         - .gitattributes
diff --git a/.mr-label-maker.yml b/.mr-label-maker.yml
index 305652587f7..65e8681f93c 100644
--- a/.mr-label-maker.yml
+++ b/.mr-label-maker.yml
@@ -140,7 +140,7 @@ merge_requests:
         '^include/drm-uapi/i915_drm.h': ['intel']
         '^include/drm-uapi/xe_drm.h': ['intel']
         '^include/vulkan/': ['vulkan']
-        '^meson_options.txt': ['meson']
+        '^meson.options': ['meson']
         '^README.rst': ['docs']
         '^src/amd/addrlib/': ['AMD common']
         '^src/amd/common/': ['AMD common']
diff --git a/CODEOWNERS b/CODEOWNERS
index 2d3ac0f3ebe..e69639d3211 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -21,7 +21,7 @@
 
 # Build system - Meson
 meson.build @dbaker @eric
-/meson_options.txt @dbaker @eric
+/meson.options @dbaker @eric
 /docs/meson.rst @dbaker @eric
 
 # Build system - Android
diff --git a/docs/meson.rst b/docs/meson.rst
index eefc2ae172c..219d9892bac 100644
--- a/docs/meson.rst
+++ b/docs/meson.rst
@@ -169,7 +169,7 @@ To review the options which Meson chose, run:
 Recent version of Meson can print the available options and their
 default values by running ``meson configure`` in the source directory.
 If your Meson version is too old, you can always look in the
-`meson_options.txt <https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/meson_options.txt>`__
+`meson.options <https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/meson.options>`__
 file at the root of the project.
 
 With additional arguments ``meson configure`` can be used to change
diff --git a/meson_options.txt b/meson.options
similarity index 100%
rename from meson_options.txt
rename to meson.options
diff --git a/src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml b/src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml
index 12292a394fc..f8ca382258a 100644
--- a/src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml
+++ b/src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml
@@ -36,7 +36,7 @@
     - !reference [.test, rules]
     - !reference [.no_scheduled_pipelines-rules, rules]
     # Old copy of .core-rules, missing:
-    #   - meson_options.txt
+    #   - meson.options
     #   - build-support/**/*
     #   - subprojects/**/*
     #   - src/*