diff --git a/CHANGELOG.md b/CHANGELOG.md
index f753938..a92c886 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.1.0] - 2016-11-24
+### Added
+* `TomPHP\ContextLogger\ContextLoggerAware` interface.
+* `TomPHP\ContextLogger\ContextLoggerAwareTrait` trait.
+
 ## [1.0.0] - 2016-11-20
 ### Added
-* `ContextLogger::addContext(string $name, $value)`
-* `ContextLogger::removeContext(string $name)`
+* `TomPHP\ContextLogger::addContext(string $name, $value)`
+* `TomPHP\ContextLogger::removeContext(string $name)`
diff --git a/src/ContextLogger/ContextLoggerAware.php b/src/ContextLogger/ContextLoggerAware.php
new file mode 100644
index 0000000..6bcd857
--- /dev/null
+++ b/src/ContextLogger/ContextLoggerAware.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace TomPHP\ContextLogger;
+
+use TomPHP\ContextLogger;
+
+interface ContextLoggerAware
+{
+    /**
+     * @return void
+     */
+    public function setLogger(ContextLogger $logger);
+}
diff --git a/src/ContextLogger/ContextLoggerAwareTrait.php b/src/ContextLogger/ContextLoggerAwareTrait.php
new file mode 100644
index 0000000..a9dcfc4
--- /dev/null
+++ b/src/ContextLogger/ContextLoggerAwareTrait.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace TomPHP\ContextLogger;
+
+use TomPHP\ContextLogger;
+
+trait ContextLoggerAwareTrait
+{
+    /**
+     * @var ContextLogger
+     */
+    protected $logger;
+
+    public function setLogger(ContextLogger $logger)
+    {
+        $this->logger = $logger;
+    }
+}
diff --git a/tests/ContextLogger/ContextLoggerAwareTraitTest.php b/tests/ContextLogger/ContextLoggerAwareTraitTest.php
new file mode 100644
index 0000000..170e723
--- /dev/null
+++ b/tests/ContextLogger/ContextLoggerAwareTraitTest.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace test\TomPHP\ContextLogger;
+
+use TomPHP\ContextLogger;
+use TomPHP\ContextLogger\ContextLoggerAwareTrait;
+
+final class ContextLoggerAwareTraitTest extends \PHPUnit_Framework_TestCase
+{
+    use ContextLoggerAwareTrait;
+
+    /** @test */
+    public function it_sets_the_logger_field()
+    {
+        $logger = $this->prophesize(ContextLogger::class)->reveal();
+
+        $this->setLogger($logger);
+
+        assertSame($logger, $this->logger);
+    }
+}