diff --git a/composer.json b/composer.json
index 29a58d873d0..6ddd5cd18cc 100644
--- a/composer.json
+++ b/composer.json
@@ -13,6 +13,12 @@
             "php": "5.6.0"
         }
     },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/demiankatz/zend-servicemanager"
+        }
+    ],
     "require": {
         "php": ">=5.6",
         "aferrandini/phpqrcode": "1.0.1",
@@ -53,7 +59,7 @@
         "zendframework/zend-mvc": "2.7.15",
         "zendframework/zend-paginator": "2.7.0",
         "zendframework/zend-serializer": "2.8.0",
-        "zendframework/zend-servicemanager": "2.7.10",
+        "zendframework/zend-servicemanager": "dev-master#ae73b1b3affd9c4e3031fb88c84a7082368ca6c3",
         "zendframework/zend-session": "2.8.0",
         "zendframework/zend-soap": "2.6.0",
         "zendframework/zend-stdlib": "2.7.7",
diff --git a/composer.lock b/composer.lock
index 03f246a045d..78e46aca810 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": "9f13a21ea0c32ad57ae5ef14e0ab9c0f",
+    "content-hash": "49dc9f1a089fe65602826869126e47a0",
     "packages": [
         {
             "name": "aferrandini/phpqrcode",
@@ -3402,16 +3402,16 @@
         },
         {
             "name": "zendframework/zend-servicemanager",
-            "version": "2.7.10",
+            "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/zend-servicemanager.git",
-                "reference": "ba7069c94c9af93122be9fa31cddd37f7707d5b4"
+                "url": "https://github.com/demiankatz/zend-servicemanager.git",
+                "reference": "ae73b1b3affd9c4e3031fb88c84a7082368ca6c3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/ba7069c94c9af93122be9fa31cddd37f7707d5b4",
-                "reference": "ba7069c94c9af93122be9fa31cddd37f7707d5b4",
+                "url": "https://api.github.com/repos/demiankatz/zend-servicemanager/zipball/ae73b1b3affd9c4e3031fb88c84a7082368ca6c3",
+                "reference": "ae73b1b3affd9c4e3031fb88c84a7082368ca6c3",
                 "shasum": ""
             },
             "require": {
@@ -3441,16 +3441,25 @@
                     "Zend\\ServiceManager\\": "src/"
                 }
             },
-            "notification-url": "https://packagist.org/downloads/",
+            "autoload-dev": {
+                "psr-4": {
+                    "ZendTest\\ServiceManager\\": "test/",
+                    "ZendBench\\ServiceManager\\": "benchmarks/"
+                }
+            },
             "license": [
                 "BSD-3-Clause"
             ],
+            "description": " ",
             "homepage": "https://github.com/zendframework/zend-servicemanager",
             "keywords": [
                 "servicemanager",
                 "zf2"
             ],
-            "time": "2017-12-05T16:27:36+00:00"
+            "support": {
+                "source": "https://github.com/demiankatz/zend-servicemanager/tree/undefined-factory-fix"
+            },
+            "time": "2018-06-08T21:19:09+00:00"
         },
         {
             "name": "zendframework/zend-session",
@@ -8181,6 +8190,7 @@
     "stability-flags": {
         "ahand/mobileesp": 20,
         "pear/validate_ispn": 20,
+        "zendframework/zend-servicemanager": 20,
         "ghislainf/zf2-whoops": 20
     },
     "prefer-stable": false,