diff --git wp-includes/class-wp-http-ixr-client.php wp-includes/class-wp-http-ixr-client.php
index 4c36334..8768abe 100644
--- wp-includes/class-wp-http-ixr-client.php
+++ wp-includes/class-wp-http-ixr-client.php
@@ -11,9 +11,17 @@ class WP_HTTP_IXR_Client extends IXR_Client {
 		if ( ! $path ) {
 			// Assume we have been given a URL instead
 			$bits = parse_url($server);
+			// Set correct default port based on scheme
+			if ( 'https' == $bits['scheme'] ) {
+				if ( $port == 80 )
+					$port = 443;
+					
+				if ( in_array( 'ssl', stream_get_transports() ) )
+					$bits['scheme'] = 'ssl';
+			}
 			$this->scheme = $bits['scheme'];
 			$this->server = $bits['host'];
-			$this->port = isset($bits['port']) ? $bits['port'] : 80;
+			$this->port = isset($bits['port']) ? $bits['port'] : $port;
 			$this->path = !empty($bits['path']) ? $bits['path'] : '/';
 
 			// Make absolutely sure we have a path