diff --git a/ChangeLog b/ChangeLog
index 7145e654ed0..f19c5706781 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-02-22  Nick Clifton  <nickc@cygnus.com>
+
+	* configure.in: Add mips-pe, sh-pe and arm-wince-pe targets.
+
 2000-02-16  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>
 
 	* config.guess: Synchronize with master repository.
diff --git a/config/ChangeLog b/config/ChangeLog
index 2bb3bf5acde..ac68be74c0d 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2000-02-22  Nick Clifton  <nickc@cygnus.com>
+
+	* config/mt-wince: new file: Makefile fragment for WinCE targets.
+
 2000-01-06  Geoff Keating  <geoffk@cygnus.com>
 
 	* mh-aix43: Delete, move to mt-aix43.
diff --git a/config/mt-wince b/config/mt-wince
new file mode 100644
index 00000000000..cc7d67b5889
--- /dev/null
+++ b/config/mt-wince
@@ -0,0 +1,10 @@
+# For Windows CE, we need to build the program that converts, copies,
+# and renames the platform SDK files into gcc directories.
+
+EXTRA_TARGET_HOST_ALL_MODULES:=$(EXTRA_TARGET_HOST_ALL_MODULES) all-utils
+EXTRA_TARGET_HOST_INSTALL_MODULES:=$(EXTRA_TARGET_HOST_INSTALL_MODULES) install-utils
+
+all-utils : all-libiberty
+
+install-utils : all-libiberty
+
diff --git a/configure.in b/configure.in
index 1eb33d8e4e9..e4f2a49e842 100644
--- a/configure.in
+++ b/configure.in
@@ -343,6 +343,9 @@ case "${target}" in
   *-*-aix4.[3456789]* | *-*-aix[56789].*)
     target_makefile_frag="${target_makefile_frag} config/mt-aix43"
     ;;
+  mips*-*-pe | sh*-*-pe | *arm-wince-pe)
+    target_makefile_frag="${target_makefile_frag} config/mt-wince"
+    ;;
 esac
 
 # If --enable-target-optspace always use -Os instead of -O2 to build
@@ -588,6 +591,21 @@ case "${target}" in
   arc-*-*)
     noconfigdirs="$noconfigdirs target-libgloss"
     ;;
+  sh*-*-pe|mips*-*-pe|*arm-wince-pe)
+    noconfigdirs="$noconfigdirs target-libjava target-libffi target-zlib"
+    noconfigdirs="$noconfigdirs target-boehm-gc target-qthreads target-examples"
+    noconfigdirs="$noconfigdirs target-librx target-libiberty texinfo send-pr"
+    noconfigdirs="$noconfigdirs tcl tix tk itcl libgui sim"
+    noconfigdirs="$noconfigdirs expect dejagnu"
+    # the C++ libraries don't build on top of CE's C libraries
+    noconfigdirs="$noconfigdirs target-libg++ target-libstdc++ target-libio"
+    skipdirs="$skipdirs target-newlib"
+    case "${host}" in
+      *-*-cygwin*) ;; # keep gdb and readline
+      *) noconfigdirs="$noconfigdirs gdb readline target-libio target-libstdc++ target-libg++"
+	 ;;
+    esac
+    ;;
   arm-*-pe*)
     noconfigdirs="$noconfigdirs target-libgloss"
     ;;