diff --git a/ChangeLog b/ChangeLog
index ac03aa6c4b6cb5856fa39fd74f375dc60331ae92..981711d9e9516de739669e9ff3695895661ff1bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-09-21  Nick Clifton  <nickc@cygnus.com>
+
+	* config.sub: Add fr30 target.
+	* configure.in: Add fr30 target.
+	* MAINTAINERS: Add fr30 maintainer.
+
 Tue Sep  7 23:33:57 1999  Linas Vepstas  <linas@linas.org>
 
 	* config.guess: Add OS/390 match pattern.
diff --git a/MAINTAINERS b/MAINTAINERS
index 36f538030ed3a9228b8e6315ccdbeef4d3f8868a..14636358c5f760872f718b19f78bb26c34ec02d5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -36,6 +36,7 @@ sparc port		David S. Miller		davem@redhat.com
 x86 ports		Stan Cox		scox@cygnus.com
 c4x port		Michael Hayes		m.hayes@elec.canterbury.ac.nz
 arc port		Richard Kenner		kenner@nyu.edu
+fr30 port		Nick Clifton		niclc@cygnus.com
 fortran			Craig Burley		craig@jcb-sc.com
 fortran			Richard Henderson	rth@cygnus.com	
 c++			Jason Merrill		jason@cygnus.com
diff --git a/config.sub b/config.sub
index 040a067d331a992a0066a425e046dd40ae35d20b..cecbe74df953f5a9bd6b4d644461d7d795429b1b 100755
--- a/config.sub
+++ b/config.sub
@@ -174,7 +174,7 @@ case $basic_machine in
 		| mips64vr5000 | miprs64vr5000el \
 	        | m88110 | m680[012346]0 | m683?2 | m68360 | m5200 | z8k | v70 \
 		| sparc | sparclet | sparclite | sparc64 | sparc86x | sparcv9 \
-		| thumb | v850 | c4x | d10v | h8500 | w65)
+		| thumb | v850 | c4x | d10v | h8500 | w65 | fr30)
 		basic_machine=$basic_machine-unknown
 		;;
 	# We use `pc' rather than `unknown'
@@ -205,7 +205,7 @@ case $basic_machine in
 	      | mipstx39-* | mipstx39el-* \
 	      | f301-* | arm*-* | t3e-* \
 	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
-	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* )
+	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* )
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
diff --git a/configure.in b/configure.in
index a68f923ce79e93ae168e7e5cf3edbe3aac758103..ae30d398194162ae04fc6bdd1cb50c03d9c7392b 100644
--- a/configure.in
+++ b/configure.in
@@ -352,7 +352,7 @@ case "${enable_target_optspace}:${target}" in
   yes:*)
     target_makefile_frag="${target_makefile_frag} config/mt-ospace"
     ;;
-  :m32r-*)
+  :m32r-* | fr30-*)
     target_makefile_frag="${target_makefile_frag} config/mt-ospace"
     ;;
   no:* | :*)
@@ -612,6 +612,11 @@ case "${target}" in
   d10v-*-*)
     noconfigdirs="$noconfigdirs target-librx target-libg++ target-libstdc++ target-libio target-libgloss"
     ;;
+  fr30-*-elf*)
+    if [ x${is_cross_compiler} != xno ] ; then
+	   target_configdirs="${target_configdirs} target-bsp target-libstub target-cygmon"
+    fi
+    ;;
   h8300*-*-* | \
   h8500-*-*)
     noconfigdirs="$noconfigdirs target-libg++ target-libstdc++ target-libio target-librx target-libgloss"