diff --git a/cvs-1.11.22-ipv6-proxy.patch b/cvs-1.11.22-ipv6-proxy.patch
index fa581fd..9d207c3 100644
--- a/cvs-1.11.22-ipv6-proxy.patch
+++ b/cvs-1.11.22-ipv6-proxy.patch
@@ -187,7 +187,7 @@
 -    else
 -    {
 -	hostinfo = init_sockaddr (&client_sai, root->hostname, port_number);
-+    sprintf (pbuf, "%u", port_number);
++    sprintf (pbuf, "%u", (root->proxy_hostname) ? root->proxy_port : port_number);
 +    pbuf[sizeof(pbuf)-1] = '\0';
 +    memset (&hints, 0, sizeof (hints));
 +    hints.ai_family = af;
diff --git a/cvs.spec b/cvs.spec
index 588e31a..1480022 100644
--- a/cvs.spec
+++ b/cvs.spec
@@ -6,7 +6,7 @@
 Summary: A version control system.
 Name: cvs
 Version: 1.11.22
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Development/Tools
 Source0: ftp://ftp.gnu.org/non-gnu/cvs/source/stable/%{version}/cvs-%{version}.tar.bz2
@@ -151,6 +151,9 @@ fi
 %{_sysconfdir}/profile.d/*
 
 %changelog
+* Sat Oct 28 2006 Jindrich Novy <jnovy@redhat.com> - 1.11.22-6
+- respect explicit port specification in CVS_PROXY (#212418)
+
 * Wed Oct 25 2006 Jindrich Novy <jnovy@redhat.com> - 1.11.22-5
 - spec cleanup
 - use dist, SOURCE0 now points to correct upstream URL