diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 67063f9e55..a73a033731 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2017-06-14  Max Filippov  <jcmvbkbc@gmail.com>
+
+	* MAINTAINERS: Move Maxim Grigoriev to the Past Maintainers.
+
 2017-06-14  Yao Qi  <yao.qi@linaro.org>
 
 	* aarch64-tdep.c (aarch64_gdb_print_insn): Call
diff --git a/gdb/MAINTAINERS b/gdb/MAINTAINERS
index 13bbb923da..c0e3cee736 100644
--- a/gdb/MAINTAINERS
+++ b/gdb/MAINTAINERS
@@ -332,7 +332,6 @@ the native maintainer when resolving ABI issues.
 			Corinna Vinschen	vinschen@redhat.com
 
 	xtensa		--target=xtensa-elf
-			Maxim Grigoriev		maxim2405@gmail.com
 
 All developers recognized by this file can make arbitrary changes to
 OBSOLETE targets.
@@ -728,6 +727,7 @@ Michael Snyder (global)
 Christopher Faylor (MS Windows, host & native)
 Daniel Jacobowitz (global, GNU/Linux MIPS,
   C++, GDBserver)				drow at false dot org
+Maxim Grigoriev (xtensa)			maxim2405 at gmail dot com
 
 
 Folks that have been caught up in a paper trail: