diff --git a/configure.in b/configure.in
index 4632b28c6..925167006 100644
--- a/configure.in
+++ b/configure.in
@@ -301,10 +301,11 @@ dnl Header file checks
 dnl
 AC_HEADER_STDC
 AC_HEADER_DIRENT
-AC_HAVE_HEADERS(string.h strings.h unistd.h malloc.h paths.h utime.h sys/sockio.h)
+AC_CHECK_HEADERS(string.h strings.h unistd.h malloc.h paths.h utime.h sys/sockio.h)
 dnl ultrix termio/termios are broken
 if test "$OS" != "ultrix" ; then
-    AC_HAVE_HEADERS(termio.h termios.h)
+    AC_CHECK_HEADERS(termio.h)
+    AC_CHECK_HEADERS(termios.h, AC_CHECK_FUNCS(tcgetattr))
 fi
 dnl
 dnl typedef checks
@@ -326,7 +327,7 @@ esac
 dnl
 dnl Function checks
 dnl
-AC_CHECK_FUNCS(strchr strrchr memcpy memset sysconf sigaction tzset tcsetattr strcasecmp)
+AC_CHECK_FUNCS(strchr strrchr memcpy memset sysconf sigaction tzset strcasecmp)
 AC_CHECK_FUNC(innetgr, AC_DEFINE(HAVE_INNETGR) AC_CHECK_FUNCS(getdomainname))
 AC_CHECK_FUNC(getwd, AC_DEFINE(HAVE_GETWD), LIBOBJS="$LIBOBJS getwd.o")
 AC_CHECK_FUNC(strdup, AC_DEFINE(HAVE_STRDUP), LIBOBJS="$LIBOBJS strdup.o")