diff --git a/wp-includes/class.wp-http-ixr-client.php b/wp-includes/class.wp-http-ixr-client.php
new file mode 100644
index 0000000000..6a1b2f8ac0
--- /dev/null
+++ b/wp-includes/class.wp-http-ixr-client.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * WP_HTTP_IXR_Client
+ *
+ * @package WordPress
+ * @since 3.1.0
+ *
+ */
+class WP_HTTP_IXR_Client extends IXR_Client
+{
+    function WP_HTTP_IXR_Client($server, $path = false, $port = 80, $timeout = 15)
+    {
+        if (!$path) {
+            // Assume we have been given a URL instead
+            $bits = parse_url($server);
+            $this->scheme = $bits['scheme'];
+            $this->server = $bits['host'];
+            $this->port = isset($bits['port']) ? $bits['port'] : 80;
+            $this->path = isset($bits['path']) ? $bits['path'] : '/';
+
+            // Make absolutely sure we have a path
+            if (!$this->path) {
+                $this->path = '/';
+            }
+        } else {
+        	$this->scheme = 'http'; 
+            $this->server = $server;
+            $this->path = $path;
+            $this->port = $port;
+        }
+        $this->useragent = 'The Incutio XML-RPC PHP Library';
+        $this->timeout = $timeout;
+    }
+
+    function query()
+    {
+        $args = func_get_args();
+        $method = array_shift($args);
+        $request = new IXR_Request($method, $args);
+        $xml = $request->getXml();
+
+        $url = $this->scheme . '://' . $this->server . ':' . $this->port . $this->path;
+        $args = array(
+            'headers'    => array('Content-Type' => 'text/xml'),
+            'user-agent' => $this->useragent,
+            'body'       => $xml,
+        );
+        
+        // Merge Custom headers ala #8145
+		foreach ( $this->headers as $header => $value )
+			$args['headers'][$header] = $value;
+        
+		if ( $this->timeout !== false )
+			$args['timeout'] = $this->timeout;
+        	
+        // Now send the request
+        if ($this->debug) {
+            echo '<pre class="ixr_request">'.htmlspecialchars($xml)."\n</pre>\n\n";
+        }
+
+		$response = wp_remote_post($url, $args); 
+
+		if ( is_wp_error($response) ) { 
+			$errno    = $response->get_error_code(); 
+			$errorstr = $response->get_error_message(); 
+			$this->error = new IXR_Error(-32300, "transport error: $errno $errstr"); 
+			return false;
+		}
+ 	
+		$code = $response['response']['code']; 
+		if ( $code != 200 ) { 
+			$this->error = new IXR_Error(-32301, "transport error - HTTP status code was not 200 ($code)");             return false;
+        }
+
+        if ($this->debug) {
+            echo '<pre class="ixr_response">'.htmlspecialchars($response['body'])."\n</pre>\n\n";
+        }
+
+        // Now parse what we've got back
+        $this->message = new IXR_Message( $response['body'] );
+        if (!$this->message->parse()) {
+            // XML error
+            $this->error = new IXR_Error(-32700, 'parse error. not well formed');
+            return false;
+        }
+
+        // Is the message a fault?
+        if ($this->message->messageType == 'fault') {
+            $this->error = new IXR_Error($this->message->faultCode, $this->message->faultString);
+            return false;
+        }
+
+        // Message must be OK
+        return true;
+    }
+}
+?>
\ No newline at end of file