diff --git a/README.md b/README.md
index 6975b0e..e5c1fbd 100644
--- a/README.md
+++ b/README.md
@@ -36,11 +36,11 @@ $response = $dispatcher->dispatch($request);
 
 For simplicity, the middleware-stack in a `Dispatcher` is immutable - if you need a stack you can manipulate, `array`, `ArrayObject`, `SplStack` etc. are all fine choices.
 
-To implement reusable middleware components, you should implement the PSR-15 [MiddlewareInterface](https://github.com/http-interop/http-middleware/blob/master/src/MiddlewareInterface.php).
+To implement reusable middleware components, you should implement the PSR-15 [MiddlewareInterface](https://github.com/php-fig/http-server-middleware/blob/master/src/MiddlewareInterface.php).
 
 ```php
 use Psr\Http\Message\ServerRequestInterface;
-use Interop\Http\ServerMiddleware\MiddlewareInterface;
+use Psr\Http\ServerMiddleware\MiddlewareInterface;
 
 class MyMiddleware implements MiddlewareInteface
 {
diff --git a/composer.json b/composer.json
index 07b0282..56dbba5 100644
--- a/composer.json
+++ b/composer.json
@@ -12,10 +12,10 @@
     "require": {
         "php": ">=7.0",
         "psr/http-message": "^1.0",
-        "http-interop/http-server-handler": "^1.0",
-        "http-interop/http-server-middleware": "^1.0",
         "psr/container": "^1.0",
-        "mindplay/readable": "^1"
+        "mindplay/readable": "^1",
+        "psr/http-server-handler": "^1.0",
+        "psr/http-server-middleware": "^1.0"
     },
     "require-dev": {
         "mindplay/testies": "^0.2.0",
diff --git a/src/Delegate.php b/src/Delegate.php
index d2ba1cb..71092de 100644
--- a/src/Delegate.php
+++ b/src/Delegate.php
@@ -2,7 +2,7 @@
 
 namespace mindplay\middleman;
 
-use Interop\Http\Server\RequestHandlerInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 
diff --git a/src/Dispatcher.php b/src/Dispatcher.php
index 627308c..464198b 100644
--- a/src/Dispatcher.php
+++ b/src/Dispatcher.php
@@ -2,8 +2,8 @@
 
 namespace mindplay\middleman;
 
-use Interop\Http\Server\MiddlewareInterface;
-use Interop\Http\Server\RequestHandlerInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use InvalidArgumentException;
 use LogicException;
 use mindplay\readable;
diff --git a/test/test.php b/test/test.php
index b358191..09ed6a2 100644
--- a/test/test.php
+++ b/test/test.php
@@ -1,7 +1,7 @@
 <?php
 
-use Interop\Http\Server\MiddlewareInterface;
-use Interop\Http\Server\RequestHandlerInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use Interop\Container\ContainerInterface;
 use mindplay\middleman\ContainerResolver;
 use mindplay\middleman\Dispatcher;