diff --git a/Doxyfile b/Doxyfile
index 6c13e02a..62e0c5be 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         = 3.1.1
+PROJECT_NUMBER         = 3.2.0
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
diff --git a/FOCUS b/FOCUS
index e13b9aa0..f288597a 100644
--- a/FOCUS
+++ b/FOCUS
@@ -1,4 +1,4 @@
-9 - Major security fixes
+5 - Major feature enhancements
 
 [ Appendix A: Release focus IDs ]
 0 - N/A
diff --git a/NEWS b/NEWS
index 985d04af..3c8ec4fa 100644
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,7 @@ NEWS ( CHANGELOG and HISTORY )                                     HTMLPurifier
     . Internal change
 ==========================
 
-3.2.0, unknown release date
+3.2.0, released 2008-10-31
 # Using %Core.CollectErrors forces line number/column tracking on, whereas
   previously you could theoretically turn it off.
 # HTMLPurifier_Injector->notifyEnd() is formally deprecated. Please
diff --git a/TODO b/TODO
index 6886708f..77e5a054 100644
--- a/TODO
+++ b/TODO
@@ -20,7 +20,7 @@ afraid to cast your vote for the next feature to be implemented!
 FUTURE VERSIONS
 ---------------
 
-3.2 release [It's All About Trust] (floating)
+3.3 release [It's All About Trust] (floating)
  # Implement untrusted, dangerous elements/attributes
  # Implement IDREF support (harder than it seems, since you cannot have
    IDREFs to non-existent IDs)
@@ -28,11 +28,11 @@ FUTURE VERSIONS
  - Implement <area>
  - Figure out how to simultaneously set %CSS.Trusted and %HTML.Trusted (?)
 
-3.3 release [Error'ed]
+3.4 release [Error'ed]
  # Error logging for filtering/cleanup procedures
  - XSS-attempt detection--certain errors are flagged XSS-like
 
-3.4 release [Do What I Mean, Not What I Say]
+3.5 release [Do What I Mean, Not What I Say]
  # Additional support for poorly written HTML
     - Microsoft Word HTML cleaning (i.e. MsoNormal, but research essential!)
     - Friendly strict handling of <address> (block -> <br>)
diff --git a/VERSION b/VERSION
index 50e47c89..a4f52a5d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.1.1
\ No newline at end of file
+3.2.0
\ No newline at end of file
diff --git a/WHATSNEW b/WHATSNEW
index 146c526d..e7852737 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -1,8 +1,6 @@
-HTML Purifier 3.1.1 is a security and bugfix release. This release addresses
-two security vulnerabilities, both related to CSS, and one of which only
-applies to users using Shift_JIS as their output encoding. There is also
-a security improvement regarding the imagecrash attack. There is a backwards
-incompatible change in which resources are no longer munged
-by default; please enable using %URI.MungeResources. Besides this, there
-are numerous improvements to URI munging, esp. with the addition of
-%URI.MungeSecretKey, as well as an experimental %HTML.SafeObject and %HTML.SafeEmbed.
+HTML Purifier 3.2.0 is an amalgamation of new features and fixes that
+have accumulated over a four month period.  Some notable features
+include %AutoFormat.RemoveEmpty, column tracking for tokens, 
+%AutoFormat.DisplayLinkURI and %Attr.DefaultImageAlt.  There were also
+major improvements to the test suite interface, error collection output
+and the auto-formatter framework.
diff --git a/library/HTMLPurifier.includes.php b/library/HTMLPurifier.includes.php
index 59d94755..7ebbb592 100644
--- a/library/HTMLPurifier.includes.php
+++ b/library/HTMLPurifier.includes.php
@@ -7,7 +7,7 @@
  * primary concern and you are using an opcode cache. PLEASE DO NOT EDIT THIS
  * FILE, changes will be overwritten the next time the script is run.
  * 
- * @version 3.1.1
+ * @version 3.2.0
  * 
  * @warning
  *      You must *not* include any other HTML Purifier files before this file,
diff --git a/library/HTMLPurifier.php b/library/HTMLPurifier.php
index da2269da..629f3b26 100644
--- a/library/HTMLPurifier.php
+++ b/library/HTMLPurifier.php
@@ -19,7 +19,7 @@
  */
 
 /*
-    HTML Purifier 3.1.1 - Standards Compliant HTML Filtering
+    HTML Purifier 3.2.0 - Standards Compliant HTML Filtering
     Copyright (C) 2006-2008 Edward Z. Yang
 
     This library is free software; you can redistribute it and/or
@@ -55,10 +55,10 @@ class HTMLPurifier
 {
     
     /** Version of HTML Purifier */
-    public $version = '3.1.1';
+    public $version = '3.2.0';
     
     /** Constant with version of HTML Purifier */
-    const VERSION = '3.1.1';
+    const VERSION = '3.2.0';
     
     /** Global configuration object */
     public $config;
diff --git a/library/HTMLPurifier/Config.php b/library/HTMLPurifier/Config.php
index e2fe21b6..aca84982 100644
--- a/library/HTMLPurifier/Config.php
+++ b/library/HTMLPurifier/Config.php
@@ -20,7 +20,7 @@ class HTMLPurifier_Config
     /**
      * HTML Purifier's version
      */
-    public $version = '3.1.1';
+    public $version = '3.2.0';
     
     /**
      * Bool indicator whether or not to automatically finalize 
diff --git a/release1-update.php b/release1-update.php
index 7624a5e4..54574ce0 100644
--- a/release1-update.php
+++ b/release1-update.php
@@ -104,5 +104,5 @@ file_put_contents('library/HTMLPurifier/Config.php', $config_c);
 
 passthru('php maintenance/flush.php');
 
-if ($is_dev) echo "Review changes, write something in WHATSNEW and FOCUS, and then SVN commit with log 'Release $version.'" . PHP_EOL;
+if ($is_dev) echo "Review changes, write something in WHATSNEW and FOCUS, and then commit with log 'Release $version.'" . PHP_EOL;
 else echo "Numbers updated to dev, no other modifications necessary!";