diff --git a/ssh.go b/ssh.go
index 1499ad3..03c309c 100644
--- a/ssh.go
+++ b/ssh.go
@@ -19,8 +19,8 @@ func (ki KeyboardInteractive) Challenge(user, instruction string, questions []st
 	return answers, nil
 }
 
-func NewSSHConnection(host, user, password string) (*SSHConn, error) {
-	session, err := newSSHSession(host, user, password)
+func NewSSHConnection(addr, user, password string) (*SSHConn, error) {
+	session, err := newSSHSession(addr, user, password)
 	if err != nil {
 		return nil, err
 	}
@@ -65,9 +65,7 @@ func NewSSHConnection(host, user, password string) (*SSHConn, error) {
 	}, nil
 }
 
-func newSSHSession(host, user, password string) (*ssh.Session, error) {
-	port := "22"
-
+func newSSHSession(addr, user, password string) (*ssh.Session, error) {
 	answers := KeyboardInteractive(map[string]string{
 		"Password: ": password,
 	})
@@ -83,7 +81,7 @@ func newSSHSession(host, user, password string) (*ssh.Session, error) {
 		HostKeyCallback: ssh.InsecureIgnoreHostKey(),
 	}
 
-	conn, err := ssh.Dial("tcp", host+":"+port, config)
+	conn, err := ssh.Dial("tcp", addr, config)
 	if err != nil {
 		return nil, err
 	}
diff --git a/tmsh.go b/tmsh.go
index 48d45ce..e9ce198 100644
--- a/tmsh.go
+++ b/tmsh.go
@@ -22,8 +22,8 @@ type SSHConn struct {
 	stderr  io.Reader
 }
 
-func NewSession(host, user, password string) (*BigIP, error) {
-	sshconn, err := NewSSHConnection(host, user, password)
+func NewSession(host, port, user, password string) (*BigIP, error) {
+	sshconn, err := NewSSHConnection(host+":"+port, user, password)
 	if err != nil {
 		return nil, err
 	}