diff --git a/CHANGELOG b/CHANGELOG
index 5f8964dd0..b2751c310 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
 
 Changes:
 
+ * changed the way {% set %} works when capturing (the content is now marked as safe)
  * added support for macro name in the endmacro tag
  * fixed the "length" filter for numbers
  * removed coupling between Twig_Node and Twig_Template
diff --git a/doc/templates.rst b/doc/templates.rst
index efb15ac32..ef940e1a8 100644
--- a/doc/templates.rst
+++ b/doc/templates.rst
@@ -724,7 +724,7 @@ You can also chain filters:
       <strong>SOME TEXT</strong>
     {% endfilter %}
 
-It should returns ``&lt;strong&gt;some text&lt;/strong&gt;``.
+It should return ``&lt;strong&gt;some text&lt;/strong&gt;``.
 
 Assignments
 ~~~~~~~~~~~
@@ -744,7 +744,7 @@ the ``set`` tag and can have multiple targets:
 
     {% set foo, bar = 'foo', 'bar' %}
 
-The ``set`` tag can also be used to 'capture' chunks of HTML:
+The ``set`` tag can also be used to 'capture' chunks of text:
 
 .. code-block:: jinja
 
@@ -754,6 +754,11 @@ The ``set`` tag can also be used to 'capture' chunks of HTML:
       </div>
     {% endset %}
 
+.. caution::
+
+    If you enable automatic output escaping, Twig will only consider the
+    content to be safe when capturing chunks of text.
+
 Extends
 ~~~~~~~
 
diff --git a/test/Twig/Tests/Fixtures/tags/set/basic.test b/test/Twig/Tests/Fixtures/tags/set/basic.test
index 75ad6d395..a5a9f830e 100644
--- a/test/Twig/Tests/Fixtures/tags/set/basic.test
+++ b/test/Twig/Tests/Fixtures/tags/set/basic.test
@@ -2,8 +2,10 @@
 "set" tag
 --TEMPLATE--
 {% set foo = 'foo' %}
+{% set bar = 'foo<br />' %}
 
 {{ foo }}
+{{ bar }}
 
 {% set foo, bar = 'foo', 'bar' %}
 
@@ -12,6 +14,7 @@
 return array()
 --EXPECT--
 foo
+foo&lt;br /&gt;
 
 
 foobar