diff --git a/MAINTAINERS b/MAINTAINERS
index 0e1d1b7655..d320233538 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -559,9 +559,20 @@ R:	Alexandru Isaila <aisaila@bitdefender.com>
 R:	Petre Pircalabu <ppircalabu@bitdefender.com>
 S:	Supported
 F:	tools/misc/xen-access.c
-F:	xen/*/mem_access.[ch]
-F:	xen/*/monitor.[ch]
-F:	xen/*/vm_event.[ch]
+F:	xen/arch/*/monitor.c
+F:	xen/arch/*/vm_event.c
+F:	xen/arch/arm/mem_access.c
+F:	xen/arch/x86/include/asm/hvm/monitor.h
+F:	xen/arch/x86/include/asm/hvm/vm_event.h
+F:	xen/arch/x86/mm/mem_access.c
+F:	xen/arch/x86/hvm/monitor.c
+F:	xen/arch/x86/hvm/vm_event.c
+F:	xen/common/mem_access.c
+F:	xen/common/monitor.c
+F:	xen/common/vm_event.c
+F:	xen/include/*/mem_access.h
+F:	xen/include/*/monitor.h
+F:	xen/include/*/vm_event.h
 
 VPCI
 M:	Roger Pau Monné <roger.pau@citrix.com>