From b5c42d98b308d2c0c8590f23bb903159299ce262 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Thu, 31 Aug 2000 11:13:10 +1100
Subject: [PATCH]  - (djm) Pick up new version (2.2.0) from OpenBSD CVS

---
 ChangeLog | 1 +
 INSTALL   | 2 +-
 version.h | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b23ff702a..902e9ee5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 20000831
  - (djm) Workaround SIGPIPE problems on SCO. Fix from Aran Cox 
    <acox@cv.telegroup.com>
+ - (djm) Pick up new version (2.2.0) from OpenBSD CVS
 
 20000830
  - (djm) Compile warning fixes from Mark Miller <markm@swoon.net>
diff --git a/INSTALL b/INSTALL
index d95ea4e49..4824ada63 100644
--- a/INSTALL
+++ b/INSTALL
@@ -156,7 +156,7 @@ If you need to pass special options to the compiler or linker, you
 can specify these as environment variables before running ./configure.
 For example:
 
-CFLAGS="-O -m486" LFLAGS="-s" LIBS="-lrubbish" LD="/usr/foo/ld" ./configure
+CFLAGS="-O -m486" LDFLAGS="-s" LIBS="-lrubbish" LD="/usr/foo/ld" ./configure
 
 3. Configuration
 ----------------
diff --git a/version.h b/version.h
index 6b17a676c..9fb86ab7c 100644
--- a/version.h
+++ b/version.h
@@ -1 +1 @@
-#define SSH_VERSION	"OpenSSH_2.1.1p5"
+#define SSH_VERSION	"OpenSSH_2.2.0p1"