diff --git a/MAINTAINERS b/MAINTAINERS
index 1bc063c07158c4c456de0a561427bdeef91008ae..e3b77893a4f07137e7ee54bc67f6839003090bc1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -19327,7 +19327,8 @@ F:	arch/x86/xen/*swiotlb*
 F:	drivers/xen/*swiotlb*
 
 XFS FILESYSTEM
-M:	Darrick J. Wong <darrick.wong@oracle.com>
+M:	Amir Goldstein <amir73il@gmail.com>
+M:	Darrick J. Wong <djwong@kernel.org>
 M:	linux-xfs@vger.kernel.org
 L:	linux-xfs@vger.kernel.org
 S:	Supported