diff --git a/openssh-5.1p1-forwards.diff b/openssh-5.1p1-forwards.diff
new file mode 100644
index 0000000..bb69f61
--- /dev/null
+++ b/openssh-5.1p1-forwards.diff
@@ -0,0 +1,12 @@
+--- channels.c
++++ channels.c
+@@ -2418,6 +2418,9 @@
+ 	const char *host, *addr;
+ 	char ntop[NI_MAXHOST], strport[NI_MAXSERV];
+ 
++	if (num_adm_permitted_opens >= SSH_MAX_FORWARDS_PER_DIRECTION)
++		fatal("channel_setup_fwd_listener: too many forwards");
++
+ 	host = (type == SSH_CHANNEL_RPORT_LISTENER) ?
+ 	    listen_addr : host_to_connect;
+ 	is_client = (type == SSH_CHANNEL_PORT_LISTENER);
diff --git a/openssh-askpass-gnome.spec b/openssh-askpass-gnome.spec
index 1376bb6..9cbf7ae 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:        40
+Release:        41
 Requires:       openssh = %{version} openssh-askpass = %{version}
 AutoReqProv:    on
 Summary:        A GNOME-Based Passphrase Dialog for OpenSSH
diff --git a/openssh.changes b/openssh.changes
index 1fc833b..216676e 100644
--- a/openssh.changes
+++ b/openssh.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Dec  1 15:43:14 CET 2008 - anicka@suse.cz
+
+- respect SSH_MAX_FORWARDS_PER_DIRECTION (bnc#448775)
+
 -------------------------------------------------------------------
 Mon Nov 10 16:01:27 CET 2008 - anicka@suse.cz
 
diff --git a/openssh.spec b/openssh.spec
index 986c698..71b0338 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:        40
+Release:        41
 %define xversion 1.2.4.1
 Summary:        Secure Shell Client and Server (Remote Login Program)
 Url:            http://www.openssh.com/
@@ -71,6 +71,7 @@ Patch44:        %{name}-%{version}-audit.patch
 Patch45:        %{name}-%{version}-pts.diff
 Patch46:        %{name}-%{version}-pam-fix4.diff
 Patch47:        %{name}-%{version}-strnvis.diff
+Patch48:        %{name}-%{version}-forwards.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %package      askpass
@@ -162,6 +163,7 @@ Authors:
 %patch45
 %patch46 -p1
 %patch47
+%patch48
 cp -v %{SOURCE4} .
 cp -v %{SOURCE6} .
 cd ../x11-ssh-askpass-%{xversion}
@@ -305,6 +307,8 @@ rm -rf $RPM_BUILD_ROOT
 %config %_appdefdir/SshAskpass
 
 %changelog
+* Mon Dec 01 2008 anicka@suse.cz
+- respect SSH_MAX_FORWARDS_PER_DIRECTION (bnc#448775)
 * Mon Nov 10 2008 anicka@suse.cz
 - fix printing banner (bnc#443380)
 * Fri Oct 24 2008 anicka@suse.cz