diff --git a/README.rst b/README.rst
index 9e44d78f7d2..c78c0df062a 100644
--- a/README.rst
+++ b/README.rst
@@ -12,9 +12,9 @@ Other repositories are likely forks, and code found there is not supported.
 Build & install
 ---------------
 
-You can find more information in our documentation (`docs/install.html
+You can find more information in our documentation (`docs/install.rst
 <https://mesa3d.org/install.html>`_), but the recommended way is to use
-Meson (`docs/meson.html <https://mesa3d.org/meson.html>`_):
+Meson (`docs/meson.rst <https://mesa3d.org/meson.html>`_):
 
 .. code-block:: sh
 
@@ -46,14 +46,14 @@ Bug reports
 -----------
 
 If you think something isn't working properly, please file a bug report
-(`docs/bugs.html <https://mesa3d.org/bugs.html>`_).
+(`docs/bugs.rst <https://mesa3d.org/bugs.html>`_).
 
 
 Contributing
 ------------
 
 Contributions are welcome, and step-by-step instructions can be found in our
-documentation (`docs/submittingpatches.html
+documentation (`docs/submittingpatches.rst
 <https://mesa3d.org/submittingpatches.html>`_).
 
 Note that Mesa uses gitlab for patches submission, review and discussions.
diff --git a/docs/repository.rst b/docs/repository.rst
index c0724ab9e4f..891f7bd6e60 100644
--- a/docs/repository.rst
+++ b/docs/repository.rst
@@ -54,7 +54,7 @@ please follow this procedure:
    `mesa-dev <https://lists.freedesktop.org/mailman/listinfo/mesa-dev>`__
    mailing list.
 #. Start contributing to the project by `submitting
-   patches <submittingpatches.html>`__. Specifically,
+   patches <submittingpatches.rst>`__. Specifically,
 
    -  Use `gitlab <https://gitlab.freedesktop.org/>`__ to create your
       merge requests.
diff --git a/docs/submittingpatches.rst b/docs/submittingpatches.rst
index 56149ac5bcb..94f5b7426ab 100644
--- a/docs/submittingpatches.rst
+++ b/docs/submittingpatches.rst
@@ -7,7 +7,7 @@ Basic guidelines
 -  Patches should not mix code changes with code formatting changes
    (except, perhaps, in very trivial cases.)
 -  Code patches should follow Mesa `coding
-   conventions <codingstyle.html>`__.
+   conventions <codingstyle.rst>`__.
 -  Whenever possible, patches should only affect individual Mesa/Gallium
    components.
 -  Patches should never introduce build breaks and should be bisectable
@@ -265,7 +265,7 @@ If you are not the author of the original patch, please Cc: them in your
 nomination request.
 
 The current patch status can be observed in the `staging
-branch <releasing.html#stagingbranch>`__.
+branch <releasing.rst#stagingbranch>`__.
 
 The stable tag
 ~~~~~~~~~~~~~~
@@ -332,7 +332,7 @@ broad discretion in rejecting patches that have been nominated.
    numbers to represent your measurements.
 
 If the patch complies with the rules it will be
-`cherry-picked <releasing.html#pickntest>`__. Alternatively the release
+`cherry-picked <releasing.rst#pickntest>`__. Alternatively the release
 manager will reply to the patch in question stating why the patch has
 been rejected or would request a backport. The stable-release manager
 may at times need to force-push changes to the stable branches, for
diff --git a/docs/systems.rst b/docs/systems.rst
index 8cfc04da87b..cb4bc7be021 100644
--- a/docs/systems.rst
+++ b/docs/systems.rst
@@ -31,10 +31,10 @@ Hardware drivers include:
 
 Software drivers include:
 
--  `llvmpipe <llvmpipe.html>`__ - uses LLVM for x86 JIT code generation
+-  `llvmpipe <llvmpipe.rst>`__ - uses LLVM for x86 JIT code generation
    and is multi-threaded
 -  softpipe - a reference Gallium driver
--  `svga <vmware-guest.html>`__ - driver for vmware virtual gpu
+-  `svga <vmware-guest.rst>`__ - driver for vmware virtual gpu
 -  `swr <https://www.openswr.org/>`__ - x86-optimized software renderer
    for visualization workloads
 -  `virgl <https://virgil3d.github.io/>`__ - research project for
@@ -45,7 +45,7 @@ Additional driver information:
 
 -  `DRI hardware drivers <https://dri.freedesktop.org/>`__ for the X
    Window System
--  `Xlib / swrast driver <xlibdriver.html>`__ for the X Window System
+-  `Xlib / swrast driver <xlibdriver.rst>`__ for the X Window System
    and Unix-like operating systems
 -  `Microsoft Windows <README.WIN32>`__
 
diff --git a/docs/versions.rst b/docs/versions.rst
index 53ce11f64c4..bde4dd29e9d 100644
--- a/docs/versions.rst
+++ b/docs/versions.rst
@@ -4,7 +4,7 @@ Mesa Version History
 .. note::
 
    Changes for Mesa 6.4 and later are documented in the corresponding
-   `release notes <relnotes.html>`__ file.
+   `release notes <relnotes.rst>`__ file.
 
 1.0 beta February 1995
 ----------------------
@@ -1653,4 +1653,4 @@ Bug fixes:
 .. note::
 
    Changes for Mesa 6.4 and later are documented in the corresponding
-   `release notes <relnotes.html>`__ file.
+   `release notes <relnotes.rst>`__ file.