diff --git a/Config_File.class.php b/Config_File.class.php
index af16f562..35b4eb9f 100644
--- a/Config_File.class.php
+++ b/Config_File.class.php
@@ -5,7 +5,7 @@ require_once "PEAR.php";
 /**
  * Config_File class.
  *
- * @version 1.5.0
+ * @version 1.5.1
  * @author Andrei Zmievski <andrei@php.net>
  * @access public
  * 
diff --git a/NEWS b/NEWS
index d0000c2c..dde06276 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+Version 1.5.1
+-------------
     - removed error message from the generic _read_file() method, the caller
       should take care of that. (Andrei)
     - fixed a bug with incorrectly combined cache and compile id. (Andrei)
diff --git a/README b/README
index db9c9e32..511b5ad7 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ NAME:
 
     Smarty - the PHP compiling template engine
 
-VERSION: 1.5.0
+VERSION: 1.5.1
 
 AUTHORS:
     
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 490d8294..1bd4388c 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,3 +1,8 @@
+1.5.1
+-----
+
+Critical bug fix release. If you use caching, you'll need to upgrade.
+
 1.5.0
 -----
 
diff --git a/Smarty.addons.php b/Smarty.addons.php
index fb47f0ff..b83b13d0 100644
--- a/Smarty.addons.php
+++ b/Smarty.addons.php
@@ -4,7 +4,7 @@
  * File:        Smarty.addons.php
  * Author:      Monte Ohrt <monte@ispi.net>
  *              Andrei Zmievski <andrei@php.net>
- * Version:     1.5.0
+ * Version:     1.5.1
  * Copyright:   2001 ispi of Lincoln, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/Smarty.class.php b/Smarty.class.php
index c4a1eded..468f2952 100644
--- a/Smarty.class.php
+++ b/Smarty.class.php
@@ -6,7 +6,7 @@
  * Author:      Monte Ohrt <monte@ispi.net>
  *              Andrei Zmievski <andrei@php.net>
  *
- * Version:     1.5.0
+ * Version:     1.5.1
  * Copyright:   2001 ispi of Lincoln, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -201,7 +201,7 @@ class Smarty
     var $_conf_obj             =   null;       // configuration object
     var $_config               =   array();    // loaded configuration settings
     var $_smarty_md5           =   'f8d698aea36fcbead2b9d5359ffca76f'; // md5 checksum of the string 'Smarty'
-    var $_version              =   '1.5.0';    // Smarty version number
+    var $_version              =   '1.5.1';    // Smarty version number
     var $_extract              =   false;      // flag for custom functions
     var $_inclusion_depth      =   0;          // current template inclusion depth
     var $_compile_id           =   null;       // for different compiled templates
diff --git a/Smarty_Compiler.class.php b/Smarty_Compiler.class.php
index 43334bef..afaa4487 100644
--- a/Smarty_Compiler.class.php
+++ b/Smarty_Compiler.class.php
@@ -6,7 +6,7 @@
  * Author:      Monte Ohrt <monte@ispi.net>
  *              Andrei Zmievski <andrei@php.net>
  *
- * Version:     1.5.0
+ * Version:     1.5.1
  * Copyright:   2001 ispi of Lincoln, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/libs/Config_File.class.php b/libs/Config_File.class.php
index af16f562..35b4eb9f 100644
--- a/libs/Config_File.class.php
+++ b/libs/Config_File.class.php
@@ -5,7 +5,7 @@ require_once "PEAR.php";
 /**
  * Config_File class.
  *
- * @version 1.5.0
+ * @version 1.5.1
  * @author Andrei Zmievski <andrei@php.net>
  * @access public
  * 
diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
index c4a1eded..468f2952 100644
--- a/libs/Smarty.class.php
+++ b/libs/Smarty.class.php
@@ -6,7 +6,7 @@
  * Author:      Monte Ohrt <monte@ispi.net>
  *              Andrei Zmievski <andrei@php.net>
  *
- * Version:     1.5.0
+ * Version:     1.5.1
  * Copyright:   2001 ispi of Lincoln, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -201,7 +201,7 @@ class Smarty
     var $_conf_obj             =   null;       // configuration object
     var $_config               =   array();    // loaded configuration settings
     var $_smarty_md5           =   'f8d698aea36fcbead2b9d5359ffca76f'; // md5 checksum of the string 'Smarty'
-    var $_version              =   '1.5.0';    // Smarty version number
+    var $_version              =   '1.5.1';    // Smarty version number
     var $_extract              =   false;      // flag for custom functions
     var $_inclusion_depth      =   0;          // current template inclusion depth
     var $_compile_id           =   null;       // for different compiled templates
diff --git a/libs/Smarty_Compiler.class.php b/libs/Smarty_Compiler.class.php
index 43334bef..afaa4487 100644
--- a/libs/Smarty_Compiler.class.php
+++ b/libs/Smarty_Compiler.class.php
@@ -6,7 +6,7 @@
  * Author:      Monte Ohrt <monte@ispi.net>
  *              Andrei Zmievski <andrei@php.net>
  *
- * Version:     1.5.0
+ * Version:     1.5.1
  * Copyright:   2001 ispi of Lincoln, Inc.
  *
  * This library is free software; you can redistribute it and/or