diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a8735a28b84..6fa5ba50dcd 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2015-08-26  Pedro Alves  <palves@redhat.com>
+
+	* MAINTAINERS: Add Markus Metzger as btrace maintainer.
+
 2015-08-24  Pedro Alves  <palves@redhat.com>
 
 	* defs.h (maybe_quit): Declare.
diff --git a/gdb/MAINTAINERS b/gdb/MAINTAINERS
index 9b395d7ea24..9984c67d4c1 100644
--- a/gdb/MAINTAINERS
+++ b/gdb/MAINTAINERS
@@ -386,6 +386,13 @@ testsuite
 SystemTap		Sergio Durigan Junior	sergiodj@redhat.com
 
 
+
+Reverse debugging / Record and Replay / Tracing:
+
+record btrace		Markus T. Metzger	markus.t.metzger@intel.com
+
+
+
 UI: External (user) interfaces.
 
 gdbtk (c & tcl)		Fernando Nasser         fnasser@redhat.com