diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00c5136..1a7d586 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## 1.5.0 - 2018-xx-xx
+
+### Added
+
+- Support for `nyholm/psr7` version 1.0. 
+
 ## 1.4.0 - 2018-02-06
 
 ### Added
diff --git a/composer.json b/composer.json
index 128af59..56a6ec8 100644
--- a/composer.json
+++ b/composer.json
@@ -43,6 +43,9 @@
             "dev-master": "1.3-dev"
         }
     },
+    "conflict": {
+        "nyholm/psr7": "<1.0"
+    },
     "prefer-stable": true,
     "minimum-stability": "beta"
 }
diff --git a/src/Strategy/CommonClassesStrategy.php b/src/Strategy/CommonClassesStrategy.php
index 31a3965..e7589a3 100644
--- a/src/Strategy/CommonClassesStrategy.php
+++ b/src/Strategy/CommonClassesStrategy.php
@@ -29,9 +29,7 @@
 use Http\Adapter\Zend\Client as Zend;
 use Http\Adapter\Artax\Client as Artax;
 use Nyholm\Psr7\Request as NyholmRequest;
-use Nyholm\Psr7\Factory\MessageFactory as NyholmMessageFactory;
-use Nyholm\Psr7\Factory\StreamFactory as NyholmStreamFactory;
-use Nyholm\Psr7\Factory\UriFactory as NyholmUriFactory;
+use Nyholm\Psr7\Factory\HttplugFactory as NyholmHttplugFactory;
 
 /**
  * @internal
@@ -45,19 +43,20 @@ final class CommonClassesStrategy implements DiscoveryStrategy
      */
     private static $classes = [
         MessageFactory::class => [
-            ['class' => NyholmMessageFactory::class, 'condition' => [NyholmRequest::class, NyholmMessageFactory::class]],
+            ['class' => NyholmHttplugFactory::class, 'condition' => [NyholmHttplugFactory::class]],
             ['class' => GuzzleMessageFactory::class, 'condition' => [GuzzleRequest::class, GuzzleMessageFactory::class]],
             ['class' => DiactorosMessageFactory::class, 'condition' => [DiactorosRequest::class, DiactorosMessageFactory::class]],
             ['class' => SlimMessageFactory::class, 'condition' => [SlimRequest::class, SlimMessageFactory::class]],
         ],
         StreamFactory::class => [
-            ['class' => NyholmStreamFactory::class, 'condition' => [NyholmRequest::class, NyholmStreamFactory::class]],
+            ['class' => NyholmHttplugFactory::class, 'condition' => [NyholmHttplugFactory::class]],
             ['class' => GuzzleStreamFactory::class, 'condition' => [GuzzleRequest::class, GuzzleStreamFactory::class]],
             ['class' => DiactorosStreamFactory::class, 'condition' => [DiactorosRequest::class, DiactorosStreamFactory::class]],
             ['class' => SlimStreamFactory::class, 'condition' => [SlimRequest::class, SlimStreamFactory::class]],
+            ['class' => NyholmStreamFactory::class, 'condition' => [NyholmRequest::class, NyholmStreamFactory::class]],
         ],
         UriFactory::class => [
-            ['class' => NyholmUriFactory::class, 'condition' => [NyholmRequest::class, NyholmUriFactory::class]],
+            ['class' => NyholmHttplugFactory::class, 'condition' => [NyholmHttplugFactory::class]],
             ['class' => GuzzleUriFactory::class, 'condition' => [GuzzleRequest::class, GuzzleUriFactory::class]],
             ['class' => DiactorosUriFactory::class, 'condition' => [DiactorosRequest::class, DiactorosUriFactory::class]],
             ['class' => SlimUriFactory::class, 'condition' => [SlimRequest::class, SlimUriFactory::class]],