5 files changed, 10 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 3ce097835..4ad26aa15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
    <andre.lucas@dial.pipex.com>
  - Reorder PAM initialisation so it does not mess up lastlog. Reported
    by Andre Lucas <andre.lucas@dial.pipex.com>
+ - Use preformatted manpages on SCO, report from Gary E. Miller 
+   <gem@rellim.com>
+ - New URL for x11-ssh-askpass.
 
 20000124
  - Pick up version 1.2.2 from OpenBSD CVS (no changes, just version number
diff --git a/INSTALL b/INSTALL
index 95722e4d1..90bee1905 100644
--- a/INSTALL
+++ b/INSTALL
@@ -30,8 +30,7 @@ http://www.gnome.org/
 Alternatly Jim Knoble <jmknoble@pobox.com> has written an excellent X11
 passphrase requester. This is maintained seperatly at:
 
-http://www.pobox.com/~jmknoble/jmk/
-
+http://www.ntrnet.net/~jmknoble/software/x11-ssh-askpass/index.html
 
 If you are planning to use OpenSSH on a Unix which lacks a Kernel random
 number generator (/dev/urandom), you will need to install the Entropy
diff --git a/TODO b/TODO
index 785b49066..4a92ad995 100644
--- a/TODO
+++ b/TODO
@@ -8,3 +8,5 @@
   lack of u_intXX_t types. There must be a better way.
 
 - Move all compatability cruft (bsd-*, fake-*) into subordinate library
+
+- Cleanup configure.in
diff --git a/configure.in b/configure.in
index 6f5cdafc7..615a8dac3 100644
--- a/configure.in
+++ b/configure.in
@@ -125,6 +125,9 @@ case "$host" in
         AC_DEFINE(USE_UTMPX)
         ;;
 *-*-sysv*)
+        AC_DEFINE(USE_UTMPX)
+        MANTYPE='$(CATMAN)'
+        mansubdir=cat
         LIBS="$LIBS -lgen -lsocket"
         ;;
 esac
diff --git a/packages/redhat/openssh.spec b/packages/redhat/openssh.spec
index 2494d0041..ece13c5b7 100644
--- a/packages/redhat/openssh.spec
+++ b/packages/redhat/openssh.spec
@@ -10,7 +10,7 @@ Version: %{oversion}
 Release: 1
 Packager: Damien Miller <djm@ibs.com.au>
 Source0: http://violet.ibs.com.au/openssh/files/openssh-%{oversion}.tar.gz
-Source1: http://www.pobox.com/~jmknoble/jmk/x11-ssh-askpass-%{aversion}.tar.gz
+Source1: http://www.ntrnet.net/~jmknoble/software/x11-ssh-askpass/x11-ssh-askpass-%{aversion}.tar.gz
 Copyright: BSD
 Group: Applications/Internet
 BuildRoot: /tmp/openssh-%{version}-buildroot