diff --git a/CHANGELOG.md b/CHANGELOG.md
index 05be725..bbb03ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log
 
 
+## Unreleased
+
+### Added
+
+- Autoregistration of stream filters using Composer autoload
+
+
 ## 0.1.2 - 2015-12-26
 
 ### Added
diff --git a/composer.json b/composer.json
index 3d1617c..5044d35 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,10 @@
     "autoload": {
         "psr-4": {
             "Http\\Message\\": "src/"
-        }
+        },
+        "files": [
+            "src/filters.php"
+        ]
     },
     "autoload-dev": {
         "psr-4": {
diff --git a/src/Encoding/ChunkStream.php b/src/Encoding/ChunkStream.php
index 762131a..3e663b6 100644
--- a/src/Encoding/ChunkStream.php
+++ b/src/Encoding/ChunkStream.php
@@ -14,10 +14,6 @@ class ChunkStream extends FilteredStream
      */
     public function getReadFilter()
     {
-        if (!array_key_exists('chunk', stream_get_filters())) {
-            stream_filter_register('chunk', 'Http\Message\Encoding\Filter\Chunk');
-        }
-
         return 'chunk';
     }
 
diff --git a/src/Encoding/DechunkStream.php b/src/Encoding/DechunkStream.php
index 2312fcb..56d1208 100644
--- a/src/Encoding/DechunkStream.php
+++ b/src/Encoding/DechunkStream.php
@@ -24,10 +24,6 @@ public function getReadFilter()
      */
     public function getWriteFilter()
     {
-        if (!array_key_exists('chunk', stream_get_filters())) {
-            stream_filter_register('chunk', 'Http\Message\Encoding\Filter\Chunk');
-        }
-
         return 'chunk';
     }
 }
diff --git a/src/filters.php b/src/filters.php
new file mode 100644
index 0000000..15ed73d
--- /dev/null
+++ b/src/filters.php
@@ -0,0 +1,6 @@
+<?php
+
+// Register chunk filter if not found
+if (!array_key_exists('chunk', stream_get_filters())) {
+    stream_filter_register('chunk', 'Http\Message\Encoding\Filter\Chunk');
+}