diff --git a/CREDITS b/CREDITS
index ba89d9f6b..71634de2d 100644
--- a/CREDITS
+++ b/CREDITS
@@ -12,7 +12,7 @@ Andrew Stribblehill <a.d.stribblehill@durham.ac.uk> - Bugfixes
 Andy Sloane <andy@guildsoftware.com> - bugfixes
 Aran Cox <acox@cv.telegroup.com> - SCO bugfixes
 Arkadiusz Miskiewicz <misiek@pld.org.pl> - IPv6 compat fixes
-Ben Lindstrom <mouring@pconline.com> - NeXT support
+Ben Lindstrom <mouring@eviladmin.org> - NeXT support
 Ben Taylor <bent@clark.net> - Solaris debugging and fixes
 Bratislav ILICH <bilic@zepter.ru> - Configure fix
 Charles Levert <charles@comm.polymtl.ca> - SunOS 4 & bug fixes
diff --git a/ChangeLog b/ChangeLog
index 5df35b453..b2876463a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20001202
+ - (bal) Backed out of part of Alain St-Denis' loginrec.c patch.
+ - (bal) Irix need some sort of mansubdir, patch by Michael Stone 
+   <mstone@cs.loyola.edu>
+
 20001129
  - (djm) Back out all the serverloop.c hacks. sshd will now hang again
    if there are background children with open fds.
diff --git a/TODO b/TODO
index 86bb71ad5..cc274c885 100644
--- a/TODO
+++ b/TODO
@@ -39,8 +39,6 @@ Clean up configure/makefiles:
   own directory.
   (mouring@eviladmin.org)
 
-- Fix up manpages to provide right paths to sshd_config, ssh_config, etc.
-
 Packaging:
 - Solaris: Update packaging scripts and build new sysv startup scripts
   (gilbert.r.loomis@saic.com)
diff --git a/configure.in b/configure.in
index 50e9d47ec..34c729e6b 100644
--- a/configure.in
+++ b/configure.in
@@ -119,6 +119,7 @@ case "$host" in
 	no_libsocket=1
 	no_libnsl=1
 	AC_DEFINE(BROKEN_INET_NTOA)
+	mansubdir=man
 	;;
 *-*-linux*)
 	no_dev_ptmx=1
diff --git a/loginrec.c b/loginrec.c
index 910524d18..224866128 100644
--- a/loginrec.c
+++ b/loginrec.c
@@ -161,7 +161,7 @@
 #include "xmalloc.h"
 #include "loginrec.h"
 
-RCSID("$Id: loginrec.c,v 1.27 2000/11/10 03:28:31 mouring Exp $");
+RCSID("$Id: loginrec.c,v 1.28 2000/12/01 21:19:51 mouring Exp $");
 
 #ifdef HAVE_UTIL_H
 #  include <util.h>
@@ -512,13 +512,8 @@ char *
 line_stripname(char *dst, const char *src, int dstsize)
 {
 	memset(dst, '\0', dstsize);
-#ifdef sgi
-	if (strncmp(src, "/dev/tty", 8) == 0)
-		strlcpy(dst, src + 8, dstsize);
-#else
 	if (strncmp(src, "/dev/", 5) == 0)
 		strlcpy(dst, src + 5, dstsize);
-#endif
 	else
 		strlcpy(dst, src, dstsize);
 	return dst;