diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f55afb4c39..bd1036dffd 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-19  Kazuhiro Inaoka <inaoka.kazuhiro@renesas.com>
+
+	* configure.tgt: Add gdbserver support for m32r-linux.
+
 2006-06-18  Mark Kettenis  <kettenis@gnu.org>
 
 	* m68klinux-tdep.c (m68k_linux_init_abi): Fix typo in comment.
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index f6e1ad899f..861e1ab2c1 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -109,7 +109,9 @@ iq2000-*-*)		gdb_target=iq2000 ;;
 
 m32c-*-*)		gdb_target=m32c ;;
 
-m32r*-*-linux*)		gdb_target=linux ;;
+m32r*-*-linux*)		gdb_target=linux
+			build_gdbserver=yes
+			;;
 m32r*-*-*)		gdb_target=m32r ;;
 
 m68hc11*-*-*|m6811*-*-*)	gdb_target=m68hc11 ;;