diff --git a/ClientFactory/AutoDiscoveryFactory.php b/ClientFactory/AutoDiscoveryFactory.php
new file mode 100644
index 00000000..78b64f78
--- /dev/null
+++ b/ClientFactory/AutoDiscoveryFactory.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Http\HttplugBundle\ClientFactory;
+
+use Http\Discovery\HttpClientDiscovery;
+
+/**
+ * Use auto discovery to find a HTTP client.
+ *
+ * @author Tobias Nyholm <tobias.nyholm@gmail.com>
+ */
+class AutoDiscoveryFactory implements ClientFactory
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function createClient(array $config = [])
+    {
+        return HttpClientDiscovery::find();
+    }
+}
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 00ebe74f..6f9f5aea 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -173,9 +173,15 @@ private function configureClients(ArrayNodeDefinition $root)
                     })
                     ->thenInvalid('A http client can\'t be decorated with several of FlexibleHttpClient, HttpMethodsClient and BatchClient. Only one of the following options can be true. ("flexible_client", "http_methods_client", "batch_client")')
                 ->end()
+                ->validate()
+                    ->ifTrue(function ($config) {
+                        return $config['factory'] === 'httplug.factory.auto' && !empty($config['config']);
+                    })
+                    ->thenInvalid('If you want to use the "config" key you must also specify a valid "factory".')
+                ->end()
                 ->children()
                     ->scalarNode('factory')
-                        ->isRequired()
+                        ->defaultValue('httplug.factory.auto')
                         ->cannotBeEmpty()
                         ->info('The service id of a factory to use when creating the adapter.')
                     ->end()
diff --git a/Resources/config/data-collector.xml b/Resources/config/data-collector.xml
index 98b177de..0cfcb868 100644
--- a/Resources/config/data-collector.xml
+++ b/Resources/config/data-collector.xml
@@ -27,6 +27,12 @@
         </service>
 
         <!-- ClientFactories -->
+        <service id="httplug.collector.factory.auto" class="Http\HttplugBundle\Collector\ProfileClientFactory" decorates="httplug.factory.auto" public="false">
+            <argument type="service" id="httplug.collector.factory.auto.inner"/>
+            <argument type="service" id="httplug.collector.collector"/>
+            <argument type="service" id="httplug.collector.formatter"/>
+            <argument type="service" id="debug.stopwatch"/>
+        </service>
         <service id="httplug.collector.factory.buzz" class="Http\HttplugBundle\Collector\ProfileClientFactory" decorates="httplug.factory.buzz" public="false">
             <argument type="service" id="httplug.collector.factory.buzz.inner"/>
             <argument type="service" id="httplug.collector.collector"/>
diff --git a/Resources/config/services.xml b/Resources/config/services.xml
index 1e39f74f..c9b4df13 100644
--- a/Resources/config/services.xml
+++ b/Resources/config/services.xml
@@ -12,6 +12,9 @@
         <service id="Http\Client\HttpClient" alias="httplug.client" public="false" />
 
         <!-- ClientFactories -->
+        <service id="httplug.factory.auto" class="Http\HttplugBundle\ClientFactory\AutoDiscoveryFactory" public="false">
+            <argument type="service" id="httplug.message_factory"/>
+        </service>
         <service id="httplug.factory.buzz" class="Http\HttplugBundle\ClientFactory\BuzzFactory" public="false">
             <argument type="service" id="httplug.message_factory"/>
         </service>