diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ed3e9c781b..0a934d6859 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-25  Andrew Cagney  <ac131313@redhat.com>
+
+	* MAINTAINERS: Mark h8500 as broken.  Breakage occured Fri Nov 5
+	16:32:04 1999 Andrew Cagney <cagney@b1.cygnus.com>.
+
 2002-11-25  Jim Blandy  <jimb@redhat.com>
 
 	* symfile.c (init_objfile_sect_indices): New function.
diff --git a/gdb/MAINTAINERS b/gdb/MAINTAINERS
index 2947317f54..243ed6165f 100644
--- a/gdb/MAINTAINERS
+++ b/gdb/MAINTAINERS
@@ -84,7 +84,7 @@ maintainer works with the native maintainer when resolving API issues.
 	h8300		--target=h8300hms ,-Werror
 			Maintenance only
 
-	h8500		--target=h8500hms -Werror
+	h8500		(--target=h8500hms broken)
 			Maintenance only
 			Not multi-arch, work in progress