diff --git a/README.md b/README.md
index 6aabef356dd..36948130efd 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,7 @@ PHP 7 support was added as as from version 1.9.2.3. based on the Inchoo article
 ## Maintainers
 * [Lee Saferite](https://github.com/LeeSaferite)
 * [David Robinson](https://github.com/drobinson)
+* [Daniel Fahlke aka Flyingmana](https://github.com/Flyingmana)
 * Pull requests are welcome
 
 
diff --git a/composer.json b/composer.json
index 156821cbc31..6c507ae50fb 100644
--- a/composer.json
+++ b/composer.json
@@ -12,6 +12,11 @@
       "email": "lee.saferite@aoe.com",
       "role": "Maintainer"
     },
+      {
+        "name": "Daniel Fahlke aka Flyingmana",
+        "email": "flyingmana@googlemail.com",
+        "role": "Maintainer"
+      },
     {
       "name": "David Robinson",
       "email": "david.robinson@aoe.com",