diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fadb65de5d..13d402963c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2002-01-15  Rodney Brown  <rbrown64@csc.com.au>
+
+	* config/i386/tm-i386v4.h: Define HAVE_I387_REGS.
+	* config/i386/i386v42mp.mh: Add i387-nat.o .
+	* i386v4-nat.c: Include i387-nat.h.
+	(supply_fpregset): Use i387_supply_fsave.
+	(fill_fpregset): Use i387_fill_fsave.
+
 2002-01-30  Richard Earnshaw  <rearnsha@arm.com>
 
 	* arm-tdep.c (arm_call_dummy_words): Define.
diff --git a/gdb/config/i386/i386v42mp.mh b/gdb/config/i386/i386v42mp.mh
index 1165949cde..007a8bf1e0 100644
--- a/gdb/config/i386/i386v42mp.mh
+++ b/gdb/config/i386/i386v42mp.mh
@@ -14,5 +14,5 @@ NAT_FILE= nm-i386v42mp.h
 # continuation character (backslash) to extend a commented line.  As a
 # consequence, make considers subsequent tab-indented lines to be
 # some sort of error.
-NATDEPFILES= corelow.o core-regset.o fork-child.o i386v4-nat.o solib.o solib-svr4.o solib-legacy.o procfs.o proc-api.o proc-events.o proc-flags.o proc-why.o uw-thread.o
+NATDEPFILES= corelow.o core-regset.o fork-child.o i386v4-nat.o i387-nat.o solib.o solib-svr4.o solib-legacy.o procfs.o proc-api.o proc-events.o proc-flags.o proc-why.o uw-thread.o
 
diff --git a/gdb/config/i386/tm-i386v4.h b/gdb/config/i386/tm-i386v4.h
index 071fddfd8e..2003b96de2 100644
--- a/gdb/config/i386/tm-i386v4.h
+++ b/gdb/config/i386/tm-i386v4.h
@@ -24,7 +24,7 @@
 #define TM_I386V4_H 1
 
 /* Pick up most of what we need from the generic i386 target include file. */
-
+#define HAVE_I387_REGS
 #include "i386/tm-i386.h"
 
 /* Pick up more stuff from the generic SVR4 host include file. */
diff --git a/gdb/i386v4-nat.c b/gdb/i386v4-nat.c
index 8de253d732..84dedac7bf 100644
--- a/gdb/i386v4-nat.c
+++ b/gdb/i386v4-nat.c
@@ -27,6 +27,7 @@
 #ifdef HAVE_SYS_REG_H
 #include <sys/reg.h>
 #endif
+#include "i387-nat.h"
 
 
 #ifdef HAVE_SYS_PROCFS_H