diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index d1265122fa..95070ccda2 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-25  Pedro Alves  <pedro_alves@portugalmail.pt>
+
+	* Makefile.in (EXEEXT): New.
+	(clean): Use $(EXEEXT).
+
 2007-02-25  Pedro Alves  <pedro_alves@portugalmail.pt>
 
 	* target.h (target_ops): Rename send_signal to request_interrupt,
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index 279ae3f774..dfb08032ff 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -44,6 +44,7 @@ htmldir = $(prefix)/html
 includedir = @includedir@
 
 SHELL = /bin/sh
+EXEEXT = @EXEEXT@
 
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -210,7 +211,7 @@ tags: TAGS
 clean:
 	rm -f *.o ${ADD_FILES} *~
 	rm -f version.c
-	rm -f gdbserver gdbreplay core make.log
+	rm -f gdbserver$(EXEEXT) gdbreplay$(EXEEXT) core make.log
 	rm -f reg-arm.c reg-i386.c reg-ia64.c reg-m32r.c reg-m68k.c reg-mips.c
 	rm -f reg-ppc.c reg-sh.c reg-spu.c reg-x86-64.c reg-i386-linux.c
 	rm -f reg-cris.c reg-crisv32.c reg-x86-64-linux.c reg-mips64.c