diff --git a/composer.json b/composer.json
index 4d1dc8a..7484463 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,8 @@
     "php": "^7.0",
     "doctrine/annotations": "^1.4",
     "psr/http-message": "^1.0",
-    "react/promise": "^2.4"
+    "react/promise": "^2.4",
+    "wyrihaximus/doctrine-annotation-autoloader": "^1.0"
   },
   "require-dev": {
     "api-clients/test-utilities": "^4.1",
@@ -31,10 +32,7 @@
   "autoload": {
     "psr-4": {
       "ApiClients\\Foundation\\Middleware\\": "src/"
-    },
-    "files": [
-      "src/bootstrap.php"
-    ]
+    }
   },
   "autoload-dev": {
     "psr-4": {
diff --git a/composer.lock b/composer.lock
index 2894def..cb76114 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "d2e31ee763fbb9a82426fd3ee9b9cce5",
+    "content-hash": "2ad7e5abec8e0dbb0f6bbba5ab9dcb71",
     "packages": [
         {
             "name": "doctrine/annotations",
@@ -223,6 +223,42 @@
                 "promises"
             ],
             "time": "2017-03-25T12:08:31+00:00"
+        },
+        {
+            "name": "wyrihaximus/doctrine-annotation-autoloader",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/WyriHaximus/php-doctrine-annotation-autoloader.git",
+                "reference": "9670f84b7d3ca53723556988080ebc939da345af"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/WyriHaximus/php-doctrine-annotation-autoloader/zipball/9670f84b7d3ca53723556988080ebc939da345af",
+                "reference": "9670f84b7d3ca53723556988080ebc939da345af",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/annotations": "^1.4"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "ceesjank@gmail.com"
+                }
+            ],
+            "description": "Request middleware",
+            "time": "2017-06-19T15:02:15+00:00"
         }
     ],
     "packages-dev": [
diff --git a/src/bootstrap.php b/src/bootstrap.php
deleted file mode 100644
index cdec6d0..0000000
--- a/src/bootstrap.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php declare(strict_types=1);
-
-use Doctrine\Common\Annotations\AnnotationRegistry;
-
-AnnotationRegistry::registerLoader(function (string $class) {
-    return class_exists($class);
-});