diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 8f5310393c..d2e4371de6 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jun 22 17:35:24 1992  Per Bothner  (bothner@cygnus.com)
+
+	* i386linux.c, hosts/i386linux.h, config/i386-linux.mt:
+	New files, for Linux (a free Unix clone for 386 machines).
+	* Makefile.in, configure.in, targets.c:  Update accordingly.
+
 Fri Jun 19 20:23:21 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
 	Lints for bfd_reloc_code_type->bfd_reloc_code_real_type, and
 	correct calling of howto special functions and fixes from Raeburn
diff --git a/bfd/configure.in b/bfd/configure.in
index 3bfc0818f2..54f40a7ab7 100644
--- a/bfd/configure.in
+++ b/bfd/configure.in
@@ -83,6 +83,7 @@ i386)
 		sysv* | scosysv*) my_host=i386v ;;
 		mach*)	my_host=i386mach ;;
 		msdos*)	my_host=dose ;;
+		linux)	my_host=i386linux ;;
 		esac
 		;;
 	esac
@@ -201,6 +202,7 @@ hppa-hp-bsd		) bfd_target=hppabsd ;;
 *-*-sysv4*		) bfd_target=${target_cpu}-elf ;;
 *-*-solaris2*		) bfd_target=${target_cpu}-elf ;;
 *-*-go32		) bfd_target=${target_cpu}-aout ;;		
+*-*-linux*		) bfd_target=${target_cpu}-linux ;;
 *-*-sysv*		) bfd_target=${target_cpu}-coff ;;
 *-*-scosysv*		) bfd_target=${target_cpu}-coff ;;
 tahoe-*-none		) bfd_target=${target_cpu} ;;