diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5345de9069..9a644633d4 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-07  Andrew Cagney  <ac131313@redhat.com>
+
+	* MAINTAINERS (Misc): List Daniel Jacobowitz as the GDBSERVER
+	maintainer.
+
 2002-04-07  Andrew Cagney  <ac131313@redhat.com>
 
 	* README (Reporting Bugs in GDB): Document the bug web page as the
diff --git a/gdb/MAINTAINERS b/gdb/MAINTAINERS
index 5d5845cd51..17e1a486bc 100644
--- a/gdb/MAINTAINERS
+++ b/gdb/MAINTAINERS
@@ -324,6 +324,8 @@ tui			(vacant)
 
 Misc:
 
+gdb/gdbserver		Daniel Jacobowitz	dan@debian.org
+
 Web pages.		Jim Kingdon		jkingdon@engr.sgi.com  ++
 			(anyone can edit; kingdon is just lead maintainer)