diff --git a/git-send-email.perl b/git-send-email.perl
index 9846ded8b9..bb8ddd1eef 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -1500,6 +1500,8 @@ sub smtp_auth_maybe {
 						user     => $cred->{'username'},
 						pass     => $cred->{'password'},
 						authname => $cred->{'username'},
+						host     => $smtp_server,
+						(defined $smtp_server_port ? (port => $smtp_server_port) : ()),
 					}
 				);
 				$result = $smtp->auth($sasl);