diff --git a/Maintainers.txt b/Maintainers.txt
index 31ec66b3cb..18fd2ef43c 100644
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -209,8 +209,6 @@ W: http://www.tianocore.org/ovmf/
 M: Jordan Justen <jordan.l.justen@intel.com>
 M: Laszlo Ersek <lersek@redhat.com>
 M: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-R: David Woodhouse <dwmw2@infradead.org>
-   (CSM modules)
 S: Maintained
 
 OvmfPkg: Xen-related modules
@@ -246,6 +244,10 @@ F: OvmfPkg/Tcg/
 R: Marc-André Lureau <marcandre.lureau@redhat.com>
 R: Stefan Berger <stefanb@linux.ibm.com>
 
+OvmfPkg: CSM modules
+F: OvmfPkg/Csm/
+R: David Woodhouse <dwmw2@infradead.org>
+
 PcAtChipsetPkg
 F: PcAtChipsetPkg/
 W: https://github.com/tianocore/tianocore.github.io/wiki/PcAtChipsetPkg