diff --git a/change_log.txt b/change_log.txt
index 60f5ec6b..9eaa2344 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -1,4 +1,8 @@
 ===== trunk  =====
+21.05.2013
+- bugfix modifier strip_tags:true was compiled into wrong code (Forum Topic 24287)
+- bugfix /n after ?> in Smarty.class.php did start output buffering (Issue 138)
+
 25.04.2013
 - bugfix escape and wordrap modifier could be compiled into wrong code when used in {nocache}{/nocache}
   section but caching is disabled  (Forum Topic 24260)
@@ -11,6 +15,7 @@
 - bugfix nocache blocks could be lost when using CACHING_LIFETIME_SAVED (Issue #133)
 - bugfix Compile ID gets nulled when compiling child blocks (Issue #134)
 
+
 24.01.2013
 - bugfix wrong tag type in smarty_internal_templatecompilerbase.php could cause wrong plugin search order (Forum Topic 24028)
 
diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
index af99a23c..883d12a3 100644
--- a/libs/Smarty.class.php
+++ b/libs/Smarty.class.php
@@ -1525,4 +1525,4 @@ function smartyAutoload($class)
     }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/libs/plugins/modifiercompiler.strip_tags.php b/libs/plugins/modifiercompiler.strip_tags.php
index 296a3a2d..68a9e75d 100644
--- a/libs/plugins/modifiercompiler.strip_tags.php
+++ b/libs/plugins/modifiercompiler.strip_tags.php
@@ -20,14 +20,9 @@
  */
 function smarty_modifiercompiler_strip_tags($params, $compiler)
 {
-   if (!isset($params[1])) {
-        $params[1] = true;
-    }
-    if ($params[1] === true) {
-        return "preg_replace('!<[^>]*?>!', ' ', {$params[0]})";
+ if (!isset($params[1]) || $params[1] === true ||  trim($params[1],'"') == 'true') {
+         return "preg_replace('!<[^>]*?>!', ' ', {$params[0]})";
     } else {
         return 'strip_tags(' . $params[0] . ')';
     }
 }
-
-?>
\ No newline at end of file