Doc updates
diff --git a/ChangeLog b/ChangeLog
index d9a8f64..d53e33a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+19991029
+ - Renamed openssh* back to ssh* at request of Theo de Raadt
+ - Incorporated latest changes from OpenBSD's CVS
+ - Integrated Makefile patch from Niels Kristian Bech Jensen <nkbj@image.dk>
+ - Integrated PAM env patch from Nalin Dahyabhai <nalin.dahyabhai@pobox.com>
+
19991028
- Further PAM enhancements.
- Much cleaner
diff --git a/README.openssh b/README.openssh
index 2cff24f..91b8c68 100644
--- a/README.openssh
+++ b/README.openssh
@@ -33,6 +33,8 @@
The OpenBSD team
'jonchen' - the original author of PAM support of SSH
Dan Brosemer <odin@linuxfreak.com> - Autoconf and build fixes
+Niels Kristian Bech Jensen <nkbj@image.dk> - Makefile patch
+Nalin Dahyabhai <nalin.dahyabhai@pobox.com> - PAM environment patch
Miscellania -
diff --git a/openssh.spec b/openssh.spec
index 9902936..0ee9468 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -1,6 +1,6 @@
Summary: OpenSSH free Secure Shell (SSH) implementation
Name: openssh
-Version: 1.2pre5
+Version: 1.2pre6
Release: 1
Packager: Damien Miller <djm@ibs.com.au>
Source0: openssh-%{version}-linux.tar.gz
@@ -20,6 +20,8 @@
patented algorithms to seperate libraries (OpenSSL).
%changelog
+* Fri Oct 29 1999 Damien Miller <djm@ibs.com.au>
+- Back to old binary names
* Thu Oct 28 1999 Damien Miller <djm@ibs.com.au>
- Use autoconf
- New binary names