diff --git a/gdb/config/i386/i386aix.mh b/gdb/config/i386/i386aix.mh
index 178cd73b45..0e7fd75c18 100644
--- a/gdb/config/i386/i386aix.mh
+++ b/gdb/config/i386/i386aix.mh
@@ -1,10 +1,8 @@
 # Host: IBM PS/2 (i386) running AIX PS/2
 XDEPFILES= 
 XM_FILE= xm-i386aix.h
-NAT_FILE= nm-i386v.h
-NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o i386v-nat.o
-XM_CLIBS=
-SYSV_DEFINE=-DSYSV -D_AIX -D_I386
+NAT_FILE= nm-i386aix.h
+NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o i386aix-nat.o
 REGEX=regex.o
 REGEX1=regex.o
 TERMCAP=-lcurses
diff --git a/gdb/config/i386/i386aix.mt b/gdb/config/i386/i386aix.mt
index ae7abb0ea8..d6198928fa 100644
--- a/gdb/config/i386/i386aix.mt
+++ b/gdb/config/i386/i386aix.mt
@@ -1,3 +1,7 @@
+# This port, for aix ps/2 (i386), will allow you to debug the coff
+# output generated gcc-2.3.3 + gas.  It will not understand IBM's
+# proprietary debug info.
+#
 # Target: IBM PS/2 (i386) running AIX PS/2
 TDEPFILES= exec.o i386-tdep.o i386-pinsn.o i387-tdep.o
 TM_FILE= tm-i386aix.h
diff --git a/gdb/config/i386/xm-i386aix.h b/gdb/config/i386/xm-i386aix.h
index ec50adb068..0d758155bd 100644
--- a/gdb/config/i386/xm-i386aix.h
+++ b/gdb/config/i386/xm-i386aix.h
@@ -23,6 +23,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
  */
 
 #include "i386/xm-i386v.h"
+
+#undef HAVE_TERMIO
+#define HAVE_SGTTY
+
 #include <limits.h>
 
 /* Use setpgid instead of setpgrp on AIX */