diff --git a/ChangeLog b/ChangeLog
index e74e712e5..7e47cb2cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
  - (djm) Clean up PCRE text in INSTALL
  - (djm) Fix OSF SIA auth NULL pointer deref. Report from Mike Battersby 
    <mib@unimelb.edu.au>
+ - (bal) NCR SVR4 compatiblity provide by Don Bragg <thewizarddon@yahoo.com>
 
 20010211
  - (bal) OpenBSD Sync
@@ -3902,4 +3903,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.747 2001/02/12 07:02:23 djm Exp $
+$Id: ChangeLog,v 1.748 2001/02/12 07:29:45 mouring Exp $
diff --git a/configure.in b/configure.in
index 8522d253d..fcb822840 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.234 2001/02/09 01:55:36 djm Exp $
+# $Id: configure.in,v 1.235 2001/02/12 07:29:45 mouring Exp $
 
 AC_INIT(ssh.c)
 
@@ -179,6 +179,13 @@ mips-sony-bsd|mips-sony-newsos4)
 	MANTYPE='$(CATMAN)'
 	mansubdir=cat
 	;;
+*-ncr-sysv*)
+	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+	LDFLAGS="$LDFLAGS -L/usr/local/lib"
+	MANTYPE='$(CATMAN)'
+	mansubdir=cat
+	LIBS="$LIBS -lc89 -lnsl -lgen -lsocket"
+	;;
 *-sni-sysv*)
 	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
 	LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/ucblib"
diff --git a/includes.h b/includes.h
index 92013aa87..a4ebbd3d3 100644
--- a/includes.h
+++ b/includes.h
@@ -45,8 +45,11 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 #include <time.h>
 #include <dirent.h>
 
+#ifdef HAVE_LIMITS_H
+# include <limits.h>
+#endif
 #ifdef HAVE_GETOPT_H
-#include <getopt.h>
+# include <getopt.h>
 #endif
 #ifdef HAVE_BSTRING_H
 # include <bstring.h>