diff --git a/Doxyfile b/Doxyfile
index 20e0cd93..4ea68b7a 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.0.0
+PROJECT_NUMBER         = 3.1.0rc1
 
 # 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 acbebbc4..a49cded7 100644
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,7 @@ NEWS ( CHANGELOG and HISTORY )                                     HTMLPurifier
     . Internal change
 ==========================
 
-3.1.0, unknown release date
+3.1.0rc1, released 2008-04-22
 # Autoload support added. Internal require_once's removed in favor of an
   explicit require list or autoloading. To use HTML Purifier,
   you must now either use HTMLPurifier.auto.php
diff --git a/VERSION b/VERSION
index 56fea8a0..9134d5d7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0.0
\ No newline at end of file
+3.1.0rc1
\ No newline at end of file
diff --git a/WHATSNEW b/WHATSNEW
index 25bc3afe..b56960ea 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -1,10 +1,8 @@
-Release 3.0.0 is the first release of 2008 and also HTML Purifier's first
-PHP 5 only release. The 2.1 series will still be supported for bug and
-security fixes, but will not get new features. This release a number of
-improvements in CSS handling, including the filter
-HTMLPurifier_Filter_ExtractStyleBlocks which integrates HTML Purifier with
-CSSTidy for cleaning style sheets, contains experimental support for
-proprietary CSS properties with %CSS.Proprietary, case-insensitive
-CSS properties, and more lenient hexadecimal color codes. Also, all code
-has been upgraded to full PHP 5 which is E_STRICT clean for all versions
-of PHP 5 (including the 5.0 series).
+Release 3.1.0rc1 is a release candidate aimed primarily at ironing out bugs
+in HTML Purifier's shiny new __autoload system.  There are lots of new features,
+however; some notable ones include support for the !important CSS modifier,
+display and visibility CSS properties with %CSS.AllowTricky, marquee
+with %HTML.Proprietary (had you scared for a moment, hmm?), a kses() wrapper,
+%CSS.AllowedProperties, %HTML.ForbiddenAttributes and %HTML.ForbiddenElements
+and a totally revamped ConfigDoc system. And of course, the usual slew of
+bugfixes.
diff --git a/library/HTMLPurifier.php b/library/HTMLPurifier.php
index 43a4e72a..836f22c5 100644
--- a/library/HTMLPurifier.php
+++ b/library/HTMLPurifier.php
@@ -21,7 +21,7 @@
  */
 
 /*
-    HTML Purifier 3.0.0 - Standards Compliant HTML Filtering
+    HTML Purifier 3.1.0rc1 - Standards Compliant HTML Filtering
     Copyright (C) 2006-2008 Edward Z. Yang
 
     This library is free software; you can redistribute it and/or
@@ -57,7 +57,7 @@ class HTMLPurifier
 {
     
     /** Version of HTML Purifier */
-    public $version = '3.0.0';
+    public $version = '3.1.0rc1';
     
     /** Global configuration object */
     public $config;
diff --git a/library/HTMLPurifier/Config.php b/library/HTMLPurifier/Config.php
index 6a282ef0..2d5900f2 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.0.0';
+    public $version = '3.1.0rc1';
     
     /**
      * Bool indicator whether or not to automatically finalize