diff --git a/bundled-libs/Smarty/NEWS b/bundled-libs/Smarty/NEWS
index 19d9082b..39c5f001 100644
--- a/bundled-libs/Smarty/NEWS
+++ b/bundled-libs/Smarty/NEWS
@@ -1,3 +1,8 @@
+Version 2.6.22 (Dec 17th, 2008)
+-------------------------------
+
+- back out method chaining, bug in some versions of PCRE causes errors (mohrt)
+
 Version 2.6.21 (Dec 2nd, 2008)
 ------------------------------
 
diff --git a/bundled-libs/Smarty/README b/bundled-libs/Smarty/README
index 45cf23c8..13ff7609 100644
--- a/bundled-libs/Smarty/README
+++ b/bundled-libs/Smarty/README
@@ -3,7 +3,7 @@ NAME:
 
     Smarty - the PHP compiling template engine
 
-VERSION: 2.6.21
+VERSION: 2.6.22
 
 AUTHORS:
     
diff --git a/bundled-libs/Smarty/libs/Config_File.class.php b/bundled-libs/Smarty/libs/Config_File.class.php
index 9dc5b3ee..31b89075 100644
--- a/bundled-libs/Smarty/libs/Config_File.class.php
+++ b/bundled-libs/Smarty/libs/Config_File.class.php
@@ -22,7 +22,7 @@
  * smarty-discussion-subscribe@googlegroups.com 
  *
  * @link http://www.smarty.net/
- * @version 2.6.19-dev
+ * @version 2.6.22
  * @copyright Copyright: 2001-2005 New Digital Group, Inc.
  * @author Andrei Zmievski <andrei@php.net>
  * @access public
diff --git a/bundled-libs/Smarty/libs/Smarty.class.php b/bundled-libs/Smarty/libs/Smarty.class.php
index 7cdc0c83..95ec67ba 100644
--- a/bundled-libs/Smarty/libs/Smarty.class.php
+++ b/bundled-libs/Smarty/libs/Smarty.class.php
@@ -27,7 +27,7 @@
  * @author Monte Ohrt <monte at ohrt dot com>
  * @author Andrei Zmievski <andrei@php.net>
  * @package Smarty
- * @version 2.6.21
+ * @version 2.6.22
  */
 
 /* $Id: Smarty.class.php 2785 2008-09-18 21:04:12Z Uwe.Tews $ */
@@ -464,7 +464,7 @@ class Smarty
      *
      * @var string
      */
-    var $_version              = '2.6.21';
+    var $_version              = '2.6.22';
 
     /**
      * current template inclusion depth
diff --git a/bundled-libs/Smarty/libs/Smarty_Compiler.class.php b/bundled-libs/Smarty/libs/Smarty_Compiler.class.php
index d950b348..374ba3d0 100644
--- a/bundled-libs/Smarty/libs/Smarty_Compiler.class.php
+++ b/bundled-libs/Smarty/libs/Smarty_Compiler.class.php
@@ -21,12 +21,12 @@
  * @link http://www.smarty.net/
  * @author Monte Ohrt <monte at ohrt dot com>
  * @author Andrei Zmievski <andrei@php.net>
- * @version 2.6.21
+ * @version 2.6.22
  * @copyright 2001-2005 New Digital Group, Inc.
  * @package Smarty
  */
 
-/* $Id: Smarty_Compiler.class.php 2797 2008-09-22 19:26:32Z monte.ohrt $ */
+/* $Id: Smarty_Compiler.class.php 2966 2008-12-08 15:10:03Z monte.ohrt $ */
 
 /**
  * Template compiling class
@@ -170,7 +170,7 @@ class Smarty_Compiler extends Smarty {
        $this->_obj_params_regexp = '\((?:' . $this->_obj_single_param_regexp
                 . '(?:\s*,\s*' . $this->_obj_single_param_regexp . ')*)?\)';
        $this->_obj_start_regexp = '(?:' . $this->_dvar_regexp . '(?:' . $this->_obj_ext_regexp . ')+)';
-       $this->_obj_call_regexp = '(?:' . $this->_obj_start_regexp . '(?:' . $this->_obj_params_regexp . '(?:' . $this->_obj_ext_regexp . '(?:'.$this->_obj_params_regexp . ')?)*' . ')?(?:' . $this->_dvar_math_regexp . '(?:' . $this->_num_const_regexp . '|' . $this->_dvar_math_var_regexp . ')*)?)';
+       $this->_obj_call_regexp = '(?:' . $this->_obj_start_regexp . '(?:' . $this->_obj_params_regexp . ')?(?:' . $this->_dvar_math_regexp . '(?:' . $this->_num_const_regexp . '|' . $this->_dvar_math_var_regexp . ')*)?)';
         
         // matches valid modifier syntax:
         // |foo
diff --git a/docs/NEWS b/docs/NEWS
index daf914ea..abe94445 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -6,6 +6,8 @@ Version 1.5 ()
 Version 1.4.1 ()
 ------------------------------------------------------------------------
 
+    * Upgrade to Smarty 2.6.22 to fix a PCRE bug
+
     * Remove warning message when checking for plugin documentation files
       on open_basedir servers (garvinhicking)