diff --git a/ChangeLog b/ChangeLog
index 466b6a8ab..da93bd2b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-23  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* configure.in: Import StrongARM and XScale target_configdirs from
+	FSF GCC version.
+
 2002-01-16  H.J. Lu  (hjl@gnu.org)
 
 	* config.guess: Import from master sources, rev 1.225.
diff --git a/configure.in b/configure.in
index c983f7db3..75bf46382 100644
--- a/configure.in
+++ b/configure.in
@@ -658,15 +658,27 @@ case "${target}" in
     ;;
   strongarm-*-elf)
     noconfigdirs="$noconfigdirs target-libffi"
+    if [ x${is_cross_compiler} != xno ] ; then
+	   target_configdirs="${target_configdirs} target-bsp target-cygmon"
+    fi
     ;;
   strongarm-*-coff)
     noconfigdirs="$noconfigdirs target-libffi"
+    if [ x${is_cross_compiler} != xno ] ; then
+	   target_configdirs="${target_configdirs} target-bsp target-cygmon"
+    fi
     ;;
   xscale-*-elf)
     noconfigdirs="$noconfigdirs target-libffi"
+    if [ x${is_cross_compiler} != xno ] ; then
+	   target_configdirs="${target_configdirs} target-bsp target-cygmon"
+    fi
     ;;
   xscale-*-coff)
     noconfigdirs="$noconfigdirs target-libffi"
+    if [ x${is_cross_compiler} != xno ] ; then
+	   target_configdirs="${target_configdirs} target-bsp target-cygmon"
+    fi
     ;;
   thumb-*-pe)
     noconfigdirs="$noconfigdirs target-libgloss target-libffi"