diff --git a/docs/conf.py b/docs/conf.py
index f699fb7818a..2092c0a2117 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -147,6 +147,7 @@ html_redirects = [
   ('gallium/drivers/zink', 'drivers/zink.html'),
   ('llvmpipe', 'drivers/llvmpipe.html'),
   ('postprocess', 'gallium/postprocess.html'),
+  ('vmware-guest', 'drivers/vmware-guest.html'),
   ('webmaster', 'https://www.mesa3d.org/website/'),
 ]
 
diff --git a/docs/contents.rst b/docs/contents.rst
index 8b93dbe3d34..96d40ba1b29 100644
--- a/docs/contents.rst
+++ b/docs/contents.rst
@@ -42,7 +42,6 @@
    debugging
    perf
    extensions
-   vmware-guest
    application-issues
    viewperf
    xlibdriver
@@ -55,6 +54,7 @@
    drivers/freedreno
    drivers/llvmpipe
    drivers/openswr
+   drivers/vmware-guest
    drivers/zink
 
 .. toctree::
diff --git a/docs/vmware-guest.rst b/docs/drivers/vmware-guest.rst
similarity index 100%
rename from docs/vmware-guest.rst
rename to docs/drivers/vmware-guest.rst
diff --git a/docs/systems.rst b/docs/systems.rst
index 8973deab271..05e081d9e97 100644
--- a/docs/systems.rst
+++ b/docs/systems.rst
@@ -34,7 +34,7 @@ Software drivers include:
 -  :doc:`llvmpipe <drivers/llvmpipe>` - uses LLVM for x86 JIT code generation
    and is multi-threaded
 -  softpipe - a reference Gallium driver
--  :doc:`svga <vmware-guest>` - driver for VMWare virtual GPU
+-  :doc:`svga <drivers/vmware-guest>` - 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