--- rpms/e-smith-openssh/sme8/e-smith-openssh.spec	2010/11/26 20:56:38	1.5
+++ rpms/e-smith-openssh/sme8/e-smith-openssh.spec	2011/03/01 20:21:38	1.6
@@ -1,10 +1,10 @@
-# $Id: e-smith-openssh.spec,v 1.4 2010/11/25 22:31:04 wellsi Exp $
+# $Id: e-smith-openssh.spec,v 1.5 2010/11/26 20:56:38 wellsi Exp $
 
 Summary: e-smith module to configure and enable ssh
 %define name e-smith-openssh
 Name: %{name}
 %define version 2.2.0
-%define release 4
+%define release 5
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -12,6 +12,8 @@ Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
 Patch0: e-smith-openssh-2.2.0-LoginGraceTime.patch
 Patch1: e-smith-openssh-2.2.0-sshConfig.patch
+Patch2: e-smith-openssh-2.2.0-obsolete-KeepAlive.patch
+Patch3: e-smith-openssh-2.2.0-ClientAliveParameters.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools
 BuildArchitectures: noarch
@@ -24,6 +26,9 @@ Requires: runit
 AutoReqProv: no
 
 %changelog
+* Tue Mar 1 2011 Jonathan Martens <smesevrer-contribs@snetram.nl> 2.2.0-5.sme
+- Obsolete KeepAlive and replace ClientAliveInterval and ClientAliveCountMax  [SME: 6380]
+
 * Fri Nov 26 2010 Ian Wells <esmith@wellsi.com> 2.2.0-4.sme
 - Change permissions of ssh_config file to 644 [SME: 43]
 
@@ -588,6 +593,8 @@ e-smith server enhancement to configure
 %setup
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 for i in console-save \