diff --git a/openssh-5.4p1-clientloop.patch b/openssh-5.4p1-clientloop.patch
new file mode 100644
index 0000000..7ccb1e3
--- /dev/null
+++ b/openssh-5.4p1-clientloop.patch
@@ -0,0 +1,12 @@
+diff -up openssh-5.6p1/clientloop.c.clientloop openssh-5.6p1/clientloop.c
+--- openssh-5.6p1/clientloop.c.clientloop	2010-11-24 08:18:10.000000000 +0100
++++ openssh-5.6p1/clientloop.c	2010-11-24 08:18:11.000000000 +0100
+@@ -1944,7 +1944,7 @@ client_input_channel_req(int type, u_int
+ 		}
+ 		packet_check_eom();
+ 	}
+-	if (reply) {
++	if (reply && c != NULL) {
+ 		packet_start(success ?
+ 		    SSH2_MSG_CHANNEL_SUCCESS : SSH2_MSG_CHANNEL_FAILURE);
+ 		packet_put_int(c->remote_id);
diff --git a/openssh.spec b/openssh.spec
index a1be665..d4a5915 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -67,7 +67,7 @@
 %endif
 
 # Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1
-%define openssh_rel 4
+%define openssh_rel 5
 %define pam_ssh_agent_rel 24
 %define pam_ssh_agent_ver 0.9.2
 
@@ -112,6 +112,7 @@ Patch73: openssh-5.4p1-gsskex.patch
 Patch74: openssh-5.3p1-randclean.patch
 Patch75: openssh-5.3p1-dso.patch
 Patch76: openssh-5.4p1-595935.patch
+Patch81: openssh-5.4p1-clientloop.patch
 
 License: BSD
 Group: Applications/Internet
@@ -266,6 +267,7 @@ popd
 %patch74 -p1 -b .randclean
 %patch75 -p1 -b .dso
 %patch76 -p1 -b .bz595935
+%patch81 -p1 -b .clientloop
 
 autoreconf
 
@@ -529,6 +531,9 @@ fi
 %endif
 
 %changelog
+* Wed Nov 24 2010 Jan F. Chadima <jchadima@redhat.com> - 5.4p1-5
+- reapair clientloop crash (#627332)
+
 * Fri Oct 20 2010 Jan F. Chadima <jchadima@redhat.com> - 5.4p1-4
 - update gsskex patch (#645389)