diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f594705c905..855bc97e94f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-07  Stan Shebs  <stan@codesourcery.com>
+
+	* MAINTAINERS (Responsible Maintainers): Add Yao Qi as
+	maintainer of the tic6x target.
+
 2011-12-07  Ulrich Weigand  <ulrich.weigand@linaro.org>
 
 	* arm-tdep.h (arm_deal_with_atomic_sequence): Add prototype.
diff --git a/gdb/MAINTAINERS b/gdb/MAINTAINERS
index 97f97accf61..a072f52b6e4 100644
--- a/gdb/MAINTAINERS
+++ b/gdb/MAINTAINERS
@@ -324,6 +324,9 @@ the native maintainer when resolving ABI issues.
 	spu		--target=spu-elf ,-Werror
 			Ulrich Weigand		uweigand@de.ibm.com
 
+	tic6x		--target=tic6x-elf ,-Werror
+			Yao Qi			yao@codesourcery.com
+
 	v850		--target=v850-elf ,-Werror
 
 	vax		--target=vax-netbsd ,-Werror