diff --git a/Doxyfile b/Doxyfile
index 4e168684..4c5a97ba 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME           = HTMLPurifier
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 2.1.4
+PROJECT_NUMBER         = 2.1.5
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
diff --git a/NEWS b/NEWS
index 092cb3f7..3870943a 100644
--- a/NEWS
+++ b/NEWS
@@ -14,7 +14,7 @@ ERRATA
   If you desire to use it, please use it with the latest, PHP5-only version of 
   HTML Purifier.
 
-2.1.5, unknown release date
+2.1.5, released 2008-06-19
 ! More robust imagecrash protection with height/width CSS with %CSS.MaxImgLength,
   and height/width HTML with %HTML.MaxImgLength.
 - AttrValidator operations are now atomic; updates to attributes are not
diff --git a/VERSION b/VERSION
index c346e7a0..c5864dcf 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.4
\ No newline at end of file
+2.1.5
\ No newline at end of file
diff --git a/WHATSNEW b/WHATSNEW
index 88d0d883..3c6686cb 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -1,6 +1,7 @@
-Security release 2.1.4 is a backport release that fixes a vulnerability
-related to URI handling. In addition, it also includes a number of
-bugfixes that have accumulated in the HTML Purifier 3 series but had
-not been merged back yet. Please remember that HTML Purifier 2.1 will
-be deprecated and will be officially dropped by the end of 2008. Please
-only use it for legacy PHP 4 installs.
+Security and bugfix release 2.1.5 is a backport that fixes two vulnerabilities
+related to CSS, one of which only occurs under Shift_JIS. It also improves
+imagecrash protection (percent CSS width and height is now disabled for
+images, and you can control the bounds with %CSS.MaxImgLength and
+%HTML.MaxImgLength). Finally, there are number of bug fixes, most notably 
+support for text-decoration: none, improved adherence to Unicode and increased
+percent encoding checks.
diff --git a/library/HTMLPurifier.php b/library/HTMLPurifier.php
index a7bba317..17cb1f80 100644
--- a/library/HTMLPurifier.php
+++ b/library/HTMLPurifier.php
@@ -22,7 +22,7 @@
  */
 
 /*
-    HTML Purifier 2.1.4 - Standards Compliant HTML Filtering
+    HTML Purifier 2.1.5 - Standards Compliant HTML Filtering
     Copyright (C) 2006-2007 Edward Z. Yang
 
     This library is free software; you can redistribute it and/or
@@ -83,7 +83,7 @@ since 2.0.0.
 class HTMLPurifier
 {
     
-    var $version = '2.1.4';
+    var $version = '2.1.5';
     
     var $config;
     var $filters = array();
diff --git a/library/HTMLPurifier/Config.php b/library/HTMLPurifier/Config.php
index 1c043aeb..bfdcc33e 100644
--- a/library/HTMLPurifier/Config.php
+++ b/library/HTMLPurifier/Config.php
@@ -42,7 +42,7 @@ class HTMLPurifier_Config
     /**
      * HTML Purifier's version
      */
-    var $version = '2.1.4';
+    var $version = '2.1.5';
     
     /**
      * Two-level associative array of configuration directives
diff --git a/release3-tag.php b/release2-tag.php
similarity index 100%
rename from release3-tag.php
rename to release2-tag.php