Index: ssh.c
===================================================================
RCS file: /home/ncvs/src/crypto/openssh/ssh.c,v
retrieving revision 1.30
diff -u -r1.30 ssh.c
--- ssh.c	22 Mar 2006 20:41:37 -0000	1.30
+++ ssh.c	3 May 2006 00:35:31 -0000
@@ -639,8 +639,13 @@
 
 	/* Get default port if port has not been set. */
 	if (options.port == 0) {
-		sp = getservbyname(SSH_SERVICE_NAME, "tcp");
-		options.port = sp ? ntohs(sp->s_port) : SSH_DEFAULT_PORT;
+		cp = getenv("SSH_PORT");
+		if (cp)
+			options.port = a2port(cp);
+		if (options.port == 0) {
+			sp = getservbyname(SSH_SERVICE_NAME, "tcp");
+			options.port = sp ? ntohs(sp->s_port) : SSH_DEFAULT_PORT;
+		}
 	}
 
 	if (options.proxy_command != NULL &&