diff --git a/MAINTAINERS b/MAINTAINERS
index 397aba34f560..7b21f56562f4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3326,7 +3326,7 @@ F:	include/linux/key-type.h
 F:	include/keys/
 F:	security/keys/
 
-KGDB / debug_core
+KGDB / KDB /debug_core
 M:	Jason Wessel <jason.wessel@windriver.com>
 W:	http://kgdb.wiki.kernel.org/
 L:	kgdb-bugreport@lists.sourceforge.net
@@ -3334,6 +3334,7 @@ S:	Maintained
 F:	Documentation/DocBook/kgdb.tmpl
 F:	drivers/misc/kgdbts.c
 F:	drivers/serial/kgdboc.c
+F:	include/linux/kdb.h
 F:	include/linux/kgdb.h
 F:	kernel/debug/