diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index a5c0bd8264..8d4e2f288e 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-19  Danny Backx  <dannybackx@users.sourceforge.net>
+
+	* configure.srv: Add x86 Windows CE target.
+
 2009-04-03  Ulrich Weigand  <uweigand@de.ibm.com>
 
 	* inferiors.c (get_thread_process): Make global.
diff --git a/gdb/gdbserver/configure.srv b/gdb/gdbserver/configure.srv
index 624acce75a..924ac66dd6 100644
--- a/gdb/gdbserver/configure.srv
+++ b/gdb/gdbserver/configure.srv
@@ -61,6 +61,15 @@ case "${target}" in
 			srv_linux_regsets=yes
 			srv_linux_thread_db=yes
 			;;
+  i[34567]86-*-mingw32ce*)
+			srv_regobj=reg-i386.o
+			srv_tgtobj="win32-low.o win32-i386-low.o"
+			srv_tgtobj="${srv_tgtobj} wincecompat.o"
+			# hostio_last_error implementation is in win32-low.c
+			srv_hostio_err_objs=""
+			srv_mingw=yes
+			srv_mingwce=yes
+			;;
   i[34567]86-*-mingw*)	srv_regobj=reg-i386.o
 			srv_tgtobj="win32-low.o win32-i386-low.o"
 			srv_mingw=yes