diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 59b79b3f42..a87342d9d3 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2000-06-08  Fernando Nasser  <fnasser@cygnus.com>
+
+	* config/i386/tm-embed.h: New file.  Specific for embedded targets
+	like i386-elf, i386-coff and i386-aout.
+	* config/i386/embed.mt (): Specify tm-embed.h instead of the System V
+	header file.
+
 2000-06-08  Fernando Nasser  <fnasser@cygnus.com>
 
 	* MAINTAINERS: Add myself to gdbtk list.
diff --git a/gdb/config/i386/embed.mt b/gdb/config/i386/embed.mt
index e717974b11..d301453279 100644
--- a/gdb/config/i386/embed.mt
+++ b/gdb/config/i386/embed.mt
@@ -1,3 +1,3 @@
 # Target: Embedded Intel 386 
 TDEPFILES= i386-tdep.o i387-tdep.o
-TM_FILE= tm-i386v.h
+TM_FILE= tm-embed.h
diff --git a/gdb/config/i386/tm-embed.h b/gdb/config/i386/tm-embed.h
new file mode 100644
index 0000000000..6d29e0e13b
--- /dev/null
+++ b/gdb/config/i386/tm-embed.h
@@ -0,0 +1,26 @@
+/* Macro definitions for i386 running as an embedded target
+   (i386-*-aout, i386-*-elf, i386-*-coff)
+   Copyright 2000 Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+
+/* Most of the rest can be assumed as similar to a SYSV target */
+
+#include "i386/tm-i386v.h"
+