diff --git a/change_log.txt b/change_log.txt
index 1b890355..c687bdf5 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -1,6 +1,7 @@
 ===== trunk  =====
 09.06.2012
 - bugfix the compiler did ignore registered compiler plugins for closing tags (Forum Topic 22094)
+- bugfix the patch for Topic 21856 did break multiline tags (Forum Topic 22124)
 
 ===== Smarty-3.1.9 =====
 07.06.2012
diff --git a/libs/sysplugins/smarty_internal_templateparser.php b/libs/sysplugins/smarty_internal_templateparser.php
index 91f8a8c8..3d2e4f05 100644
--- a/libs/sysplugins/smarty_internal_templateparser.php
+++ b/libs/sysplugins/smarty_internal_templateparser.php
@@ -2544,7 +2544,7 @@ static public $yy_action = array(
 #line 2540 "smarty_internal_templateparser.php"
 #line 503 "smarty_internal_templateparser.y"
     function yy_r66(){
-    $this->_retvalue = array(trim($this->yystack[$this->yyidx + -1]->minor,' =')=>$this->yystack[$this->yyidx + 0]->minor);
+    $this->_retvalue = array(trim($this->yystack[$this->yyidx + -1]->minor," =\n\r")=>$this->yystack[$this->yyidx + 0]->minor);
     }
 #line 2545 "smarty_internal_templateparser.php"
 #line 511 "smarty_internal_templateparser.y"