diff --git a/NEWS b/NEWS
index 72753393..bfbe6e49 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+Version 2.1.0
+-------------
+
     - introduced output filters. (Andrei)
     - changed the way filters are loaded, added load_filter()
       API function and $autoload_filters variable. (Andrei)
diff --git a/README b/README
index 7eaf27a7..9c1974dc 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ NAME:
 
     Smarty - the PHP compiling template engine
 
-VERSION: 2.0.1
+VERSION: 2.1.0
 
 AUTHORS:
     
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 2148036d..171ed5da 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,3 +1,16 @@
+2.1.0
+-----
+
+This release has quite a few new features and fixes. Most notable are the
+introduction of block functions, so you can write plugins that work on a block
+of text with {func}{/func} notation. Also output filters were added, so you can
+apply a function against the output of your templates. This differs from the 
+postfilter function, which works on the compiled template at compile time, and
+output filters work on the template output at runtime.
+
+Many other features and bug fixes are noted in the NEWS file.
+
+
 2.0.1
 -----
 
diff --git a/Smarty.class.php b/Smarty.class.php
index 345c5a77..576a023d 100644
--- a/Smarty.class.php
+++ b/Smarty.class.php
@@ -5,7 +5,7 @@
  * Author:      Monte Ohrt <monte@ispi.net>
  *              Andrei Zmievski <andrei@php.net>
  *
- * Version:     2.0.1
+ * Version:     2.1.0
  * Copyright:   2001,2002 ispi of Lincoln, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -164,7 +164,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              = '2.0.1';    // Smarty version number
+    var $_version              = '2.1.0';    // 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 c22a1612..8590ca49 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:     2.0.1
+ * Version:     2.1.0
  * Copyright:   2001,2002 ispi of Lincoln, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
index 345c5a77..576a023d 100644
--- a/libs/Smarty.class.php
+++ b/libs/Smarty.class.php
@@ -5,7 +5,7 @@
  * Author:      Monte Ohrt <monte@ispi.net>
  *              Andrei Zmievski <andrei@php.net>
  *
- * Version:     2.0.1
+ * Version:     2.1.0
  * Copyright:   2001,2002 ispi of Lincoln, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -164,7 +164,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              = '2.0.1';    // Smarty version number
+    var $_version              = '2.1.0';    // 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 c22a1612..8590ca49 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:     2.0.1
+ * Version:     2.1.0
  * Copyright:   2001,2002 ispi of Lincoln, Inc.
  *
  * This library is free software; you can redistribute it and/or