diff --git a/README.SuSE b/README.SuSE
index 5f3ec3e..ead9ae0 100644
--- a/README.SuSE
+++ b/README.SuSE
@@ -2,7 +2,10 @@
   Dear users,
 
 
-This is OpenSSH version 4.4p1.
+This is OpenSSH version 5.1p1.
+
+There is a change in default settings of ssh client: accepting and sending of
+locale environment variables in protocol 2 is enabled.
 
 There is a very important change in sshd with SuSE Linux 9.1: 
 
diff --git a/openssh-5.1p1-pam-fix4.diff b/openssh-5.1p1-pam-fix4.diff
new file mode 100644
index 0000000..ece7ea1
--- /dev/null
+++ b/openssh-5.1p1-pam-fix4.diff
@@ -0,0 +1,26 @@
+Index: openssh-5.1p1/auth-pam.c
+===================================================================
+--- openssh-5.1p1.orig/auth-pam.c
++++ openssh-5.1p1/auth-pam.c
+@@ -602,16 +602,16 @@ sshpam_cleanup(void)
+ 		return;
+ 	debug("PAM: cleanup");
+ 	pam_set_item(sshpam_handle, PAM_CONV, (const void *)&null_conv);
+-	if (sshpam_cred_established) {
+-		debug("PAM: deleting credentials");
+-		pam_setcred(sshpam_handle, PAM_DELETE_CRED);
+-		sshpam_cred_established = 0;
+-	}
+ 	if (sshpam_session_open) {
+ 		debug("PAM: closing session");
+ 		pam_close_session(sshpam_handle, PAM_SILENT);
+ 		sshpam_session_open = 0;
+ 	}
++	if (sshpam_cred_established) {
++		debug("PAM: deleting credentials");
++		pam_setcred(sshpam_handle, PAM_DELETE_CRED);
++		sshpam_cred_established = 0;
++	}
+ 	sshpam_authenticated = 0;
+ 	pam_end(sshpam_handle, sshpam_err);
+ 	sshpam_handle = NULL;
diff --git a/openssh-askpass-gnome.spec b/openssh-askpass-gnome.spec
index b46eb89..e13044a 100644
--- a/openssh-askpass-gnome.spec
+++ b/openssh-askpass-gnome.spec
@@ -23,7 +23,7 @@ BuildRequires:  gtk2-devel krb5-devel opensc-devel openssh openssl-devel pam-dev
 License:        BSD 3-Clause
 Group:          Productivity/Networking/SSH
 Version:        5.1p1
-Release:        35
+Release:        39
 Requires:       openssh = %{version} openssh-askpass = %{version}
 AutoReqProv:    on
 Summary:        A GNOME-Based Passphrase Dialog for OpenSSH
@@ -38,6 +38,7 @@ Patch21:        %{_name}-%{version}-gssapimitm.patch
 Patch26:        %{_name}-%{version}-eal3.diff
 Patch27:        %{_name}-%{version}-engines.diff
 Patch28:        %{_name}-%{version}-blocksigalrm.diff
+Patch29:        %{_name}-%{version}-pam-fix4.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -80,6 +81,7 @@ Authors:
 %patch26 -p1
 %patch27 -p1
 %patch28
+%patch29 -p1
 
 %build
 %{?suse_update_config:%{suse_update_config}}
diff --git a/openssh.changes b/openssh.changes
index a854a1c..0771afb 100644
--- a/openssh.changes
+++ b/openssh.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Oct 24 16:24:34 CEST 2008 - anicka@suse.cz
+
+- call pam functions in the right order (bnc#438292)
+- mention default forwarding of locale settings in
+  README.SuSE (bnc#434799)
+
 -------------------------------------------------------------------
 Tue Sep  9 17:55:29 CEST 2008 - anicka@suse.cz
 
diff --git a/openssh.spec b/openssh.spec
index 3364c05..a34544c 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -38,7 +38,7 @@ PreReq:         /usr/sbin/groupadd /usr/sbin/useradd %insserv_prereq  %fillup_pr
 Conflicts:      nonfreessh
 AutoReqProv:    on
 Version:        5.1p1
-Release:        35
+Release:        39
 %define xversion 1.2.4.1
 Summary:        Secure Shell Client and Server (Remote Login Program)
 Url:            http://www.openssh.com/
@@ -69,6 +69,7 @@ Patch41:        %{name}-%{version}-gcc-fix.patch
 Patch43:        %{name}-%{version}-default-protocol.diff
 Patch44:        %{name}-%{version}-audit.patch
 Patch45:        %{name}-%{version}-pts.diff
+Patch46:        %{name}-%{version}-pam-fix4.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %package      askpass
@@ -158,6 +159,7 @@ Authors:
 %patch43
 %patch44 -p1
 %patch45
+%patch46 -p1
 cp -v %{SOURCE4} .
 cp -v %{SOURCE6} .
 cd ../x11-ssh-askpass-%{xversion}
@@ -301,6 +303,10 @@ rm -rf $RPM_BUILD_ROOT
 %config %_appdefdir/SshAskpass
 
 %changelog
+* Fri Oct 24 2008 anicka@suse.cz
+- call pam functions in the right order (bnc#438292)
+- mention default forwarding of locale settings in
+  README.SuSE (bnc#434799)
 * Tue Sep 09 2008 anicka@suse.cz
 - remove pam_resmgr from sshd.pamd (bnc#422619)
 * Sun Aug 24 2008 coolo@suse.de