diff --git a/MAINTAINERS b/MAINTAINERS
index 319df7518e..b0f43d1fdc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -362,7 +362,7 @@ F:	tools/firmware/hvmloader/
 F:	tools/tests/x86_emulator/
 
 X86 MEMORY MANAGEMENT
-M:	Tim Deegan <tim@xen.org>
+M:	George Dunlap <george.dunlap@eu.citrix.com>
 S:	Supported
 F:	xen/arch/x86/mm/
 
@@ -374,6 +374,11 @@ F:	xen/arch/x86/mm/mem_sharing.c
 F:	xen/arch/x86/mm/mem_paging.c
 F:	tools/memshr
 
+X86 SHADOW PAGETABLES
+M:	Tim Deegan <tim@xen.org>
+S:	Maintained
+F:	xen/arch/x86/mm/shadow/
+
 VM EVENT AND MEM ACCESS
 M:	Razvan Cojocaru <rcojocaru@bitdefender.com>
 M:	Tamas K Lengyel <tlengyel@novetta.com>