diff --git a/faraday.gemspec b/faraday.gemspec
index bee065a96..a8a8175c2 100644
--- a/faraday.gemspec
+++ b/faraday.gemspec
@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'faraday-em_http', '~> 1.0'
   spec.add_dependency 'faraday-em_synchrony', '~> 1.0'
   spec.add_dependency 'faraday-excon', '~> 1.1'
+  spec.add_dependency 'faraday-httpclient', '~> 1.0.1'
   spec.add_dependency 'faraday-net_http', '~> 1.0'
   spec.add_dependency 'faraday-net_http_persistent', '~> 1.1'
   spec.add_dependency 'multipart-post', '>= 1.2', '< 3'
diff --git a/lib/faraday.rb b/lib/faraday.rb
index 4a351cb72..fd54a4b2a 100644
--- a/lib/faraday.rb
+++ b/lib/faraday.rb
@@ -30,6 +30,7 @@
 require 'faraday/em_http'
 require 'faraday/em_synchrony'
 require 'faraday/excon'
+require 'faraday/httpclient'
 require 'faraday/net_http'
 require 'faraday/net_http_persistent'
 
diff --git a/lib/faraday/adapter.rb b/lib/faraday/adapter.rb
index 0f3ee2e1a..764286a3f 100644
--- a/lib/faraday/adapter.rb
+++ b/lib/faraday/adapter.rb
@@ -13,8 +13,7 @@ class Adapter
                         test: [:Test, 'test'],
                         typhoeus: [:Typhoeus, 'typhoeus'],
                         patron: [:Patron, 'patron'],
-                        rack: [:Rack, 'rack'],
-                        httpclient: [:HTTPClient, 'httpclient']
+                        rack: [:Rack, 'rack']
 
     # This module marks an Adapter as supporting parallel requests.
     module Parallelism
diff --git a/lib/faraday/adapter/httpclient.rb b/lib/faraday/adapter/httpclient.rb
deleted file mode 100644
index cc563f13e..000000000
--- a/lib/faraday/adapter/httpclient.rb
+++ /dev/null
@@ -1,152 +0,0 @@
-# frozen_string_literal: true
-
-module Faraday
-  class Adapter
-    # HTTPClient adapter.
-    class HTTPClient < Faraday::Adapter
-      dependency 'httpclient'
-
-      def build_connection(env)
-        @client ||= ::HTTPClient.new.tap do |cli|
-          # enable compression
-          cli.transparent_gzip_decompression = true
-        end
-
-        if (req = env[:request])
-          if (proxy = req[:proxy])
-            configure_proxy @client, proxy
-          end
-
-          if (bind = req[:bind])
-            configure_socket @client, bind
-          end
-
-          configure_timeouts @client, req
-        end
-
-        if env[:url].scheme == 'https' && (ssl = env[:ssl])
-          configure_ssl @client, ssl
-        end
-
-        configure_client @client
-
-        @client
-      end
-
-      def call(env)
-        super
-
-        # TODO: Don't stream yet.
-        # https://github.com/nahi/httpclient/pull/90
-        env[:body] = env[:body].read if env[:body].respond_to? :read
-
-        connection(env) do |http|
-          resp = http.request env[:method], env[:url],
-                              body: env[:body],
-                              header: env[:request_headers]
-
-          if (req = env[:request]).stream_response?
-            warn "Streaming downloads for #{self.class.name} " \
-              'are not yet implemented.'
-            req.on_data.call(resp.body, resp.body.bytesize)
-          end
-          save_response env, resp.status, resp.body, resp.headers, resp.reason
-
-          @app.call env
-        end
-      rescue ::HTTPClient::TimeoutError, Errno::ETIMEDOUT
-        raise Faraday::TimeoutError, $ERROR_INFO
-      rescue ::HTTPClient::BadResponseError => e
-        if e.message.include?('status 407')
-          raise Faraday::ConnectionFailed,
-                %(407 "Proxy Authentication Required ")
-        end
-
-        raise Faraday::ClientError, $ERROR_INFO
-      rescue Errno::EADDRNOTAVAIL, Errno::ECONNREFUSED, IOError, SocketError
-        raise Faraday::ConnectionFailed, $ERROR_INFO
-      rescue StandardError => e
-        if defined?(::OpenSSL::SSL::SSLError) && \
-           e.is_a?(::OpenSSL::SSL::SSLError)
-          raise Faraday::SSLError, e
-        end
-
-        raise
-      end
-
-      # @param bind [Hash]
-      def configure_socket(client, bind)
-        client.socket_local.host = bind[:host]
-        client.socket_local.port = bind[:port]
-      end
-
-      # Configure proxy URI and any user credentials.
-      #
-      # @param proxy [Hash]
-      def configure_proxy(client, proxy)
-        client.proxy = proxy[:uri]
-        return unless proxy[:user] && proxy[:password]
-
-        client.set_proxy_auth(proxy[:user], proxy[:password])
-      end
-
-      # @param ssl [Hash]
-      def configure_ssl(client, ssl)
-        ssl_config = client.ssl_config
-        ssl_config.verify_mode = ssl_verify_mode(ssl)
-        ssl_config.cert_store = ssl_cert_store(ssl)
-
-        ssl_config.add_trust_ca ssl[:ca_file]        if ssl[:ca_file]
-        ssl_config.add_trust_ca ssl[:ca_path]        if ssl[:ca_path]
-        ssl_config.client_cert  = ssl[:client_cert]  if ssl[:client_cert]
-        ssl_config.client_key   = ssl[:client_key]   if ssl[:client_key]
-        ssl_config.verify_depth = ssl[:verify_depth] if ssl[:verify_depth]
-      end
-
-      # @param req [Hash]
-      def configure_timeouts(client, req)
-        if (sec = request_timeout(:open, req))
-          client.connect_timeout = sec
-        end
-
-        if (sec = request_timeout(:write, req))
-          client.send_timeout = sec
-        end
-
-        return unless (sec = request_timeout(:read, req))
-
-        client.receive_timeout = sec
-      end
-
-      def configure_client(client)
-        @config_block&.call(client)
-      end
-
-      # @param ssl [Hash]
-      # @return [OpenSSL::X509::Store]
-      def ssl_cert_store(ssl)
-        return ssl[:cert_store] if ssl[:cert_store]
-
-        # Memoize the cert store so that the same one is passed to
-        # HTTPClient each time, to avoid resyncing SSL sessions when
-        # it's changed
-        @ssl_cert_store ||= begin
-          # Use the default cert store by default, i.e. system ca certs
-          OpenSSL::X509::Store.new.tap(&:set_default_paths)
-        end
-      end
-
-      # @param ssl [Hash]
-      def ssl_verify_mode(ssl)
-        ssl[:verify_mode] || begin
-          if ssl.fetch(:verify, true)
-            OpenSSL::SSL::VERIFY_PEER |
-              OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
-          else
-            OpenSSL::SSL::VERIFY_NONE
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/lib/faraday/autoload.rb b/lib/faraday/autoload.rb
index de9e5e385..b96b51367 100644
--- a/lib/faraday/autoload.rb
+++ b/lib/faraday/autoload.rb
@@ -61,8 +61,7 @@ class Adapter
                  Typhoeus: 'typhoeus',
                  Patron: 'patron',
                  Test: 'test',
-                 Rack: 'rack',
-                 HTTPClient: 'httpclient'
+                 Rack: 'rack'
   end
 
   # Request represents a single HTTP request for a Faraday adapter to make.