--- openssh.spec.orig	2010-05-31 06:20:02.000000000 -0400
+++ openssh.spec	2010-09-06 21:53:21.000000000 -0400
@@ -74,7 +74,7 @@
 Summary: An open source implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 5.4p1
-Release: %{openssh_rel}%{?dist}%{?rescue_rel}
+Release: %{openssh_rel}%{?dist}%{?rescue_rel}.scripts.%{scriptsversion}
 URL: http://www.openssh.com/portable.html
 #URL1: http://pamsshagentauth.sourceforge.net
 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
@@ -88,6 +88,8 @@
 Source3: sshd.init
 Source4: http://prdownloads.sourceforge.net/pamsshagentauth/pam_ssh_agent_auth/pam_ssh_agent_auth-%{pam_ssh_agent_ver}.tar.bz2
 Source5: pam_ssh_agent-rmheaders
+Patch1001: openssh-4.7p1-gssapi-name-in-env.patch
+Patch1002: openssh-no-spurious-correct-key-incorrect-host-messages.patch
 Patch0: openssh-5.4p1-redhat.patch
 Patch2: openssh-5.3p1-skip-initial.patch
 Patch4: openssh-5.2p1-vendor.patch
@@ -175,6 +178,7 @@
 Requires(post): chkconfig >= 0.9, /sbin/service
 Requires(pre): /usr/sbin/useradd
 Requires: pam >= 1.0.1-3
+Provides: scripts-openssh-server
 
 %package askpass
 Summary: A passphrase dialog for OpenSSH and X
@@ -267,6 +271,9 @@
 %patch75 -p1 -b .dso
 %patch76 -p1 -b .bz595935
 
+%patch1001 -p1 -b .gssapi-env
+%patch1002 -p1 -b .no-spurious-correct-key-incorrect-host-messages
+
 autoreconf
 
 %build