diff --git a/ChangeLog b/ChangeLog
index 57c6d6d62..f8fdc9bab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20021122
+ - (tim) [configure.ac] fix STDPATH test for IRIX. First reported by
+   advax@triumf.ca. This type of solution tested by <herb@sgi.com>
+
 20021113
  - (tim) [configure.ac] remove unused variables no_libsocket and no_libnsl
 
@@ -825,4 +829,4 @@
      save auth method before monitor_reset_key_state(); bugzilla bug #284;
      ok provos@
 
-$Id: ChangeLog,v 1.2513 2002/11/13 23:55:55 tim Exp $
+$Id: ChangeLog,v 1.2514 2002/11/22 21:29:01 tim Exp $
diff --git a/configure.ac b/configure.ac
index 0736e41ab..e96a0721d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.92 2002/11/13 23:55:57 tim Exp $
+# $Id: configure.ac,v 1.93 2002/11/22 21:29:03 tim Exp $
 
 AC_INIT
 AC_CONFIG_SRCDIR([ssh.c])
@@ -2060,7 +2060,11 @@ Edit /etc/login.conf instead.])
 # include <paths.h>
 #endif
 #ifndef _PATH_STDPATH
-# define _PATH_STDPATH "/usr/bin:/bin:/usr/sbin:/sbin"
+# ifdef _PATH_USERPATH	/* Irix */
+#  define _PATH_STDPATH _PATH_USERPATH
+# else
+#  define _PATH_STDPATH "/usr/bin:/bin:/usr/sbin:/sbin"
+# endif
 #endif
 #include <sys/types.h>
 #include <sys/stat.h>