diff --git a/MAINTAINERS b/MAINTAINERS
index 474ec0c53272..d23851bf81f7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4856,7 +4856,8 @@ S:	Supported
 
 XFS FILESYSTEM
 P:	Silicon Graphics Inc
-P:	Bill O'Donnell
+P:	Felix Blyakher
+M:	felixb@sgi.com
 M:	xfs-masters@oss.sgi.com
 L:	xfs@oss.sgi.com
 W:	http://oss.sgi.com/projects/xfs