diff --git a/admin/index.php b/admin/index.php
index e1b7c98..28c2d44 100755
--- a/admin/index.php
+++ b/admin/index.php
@@ -26,7 +26,7 @@
 
 //  Constantes  --------------------------------------------------------------
 
-define('FROG_VERSION', '0.9.5 RC2');
+define('FROG_VERSION', '0.9.5');
 
 define('FROG_ROOT', dirname(__FILE__).'/..');
 define('CORE_ROOT', FROG_ROOT.'/frog');
diff --git a/changelog.txt b/changelog.txt
index e8b6f97..749750d 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -7,7 +7,7 @@ Sigla:
 . other development
 ======
 
-0.9.5 - released 2009-02-??
+0.9.5 - released 2009-04-27
 
 + Added experimental Global XSS filtering, by default turned off. To turn on add define('GLOBAL_XSS_FILTERING', true) to config.php - issue 162
 + Added advisory about removing changelog.txt to install screen.
diff --git a/frog/plugins/comment/index.php b/frog/plugins/comment/index.php
index ab8d107..8cd83e6 100644
--- a/frog/plugins/comment/index.php
+++ b/frog/plugins/comment/index.php
@@ -46,7 +46,7 @@
 	'author'      => 'Philippe Archambault',
 	'website'     => 'http://www.madebyfrog.com/',
     'update_url'  => 'http://www.madebyfrog.com/plugin-versions.xml',
-	'require_frog_version' => '0.9.5 RC2'
+	'require_frog_version' => '0.9.5'
 ));
 
 
diff --git a/frog/plugins/skeleton/index.php b/frog/plugins/skeleton/index.php
index ce80bef..3e40ff7 100644
--- a/frog/plugins/skeleton/index.php
+++ b/frog/plugins/skeleton/index.php
@@ -56,7 +56,7 @@
 	'author'      => 'Martijn van der Kleijn',
     'website'     => 'http://www.madebyfrog.com/',
     'update_url'  => 'http://www.madebyfrog.com/plugin-versions.xml',
-    'require_frog_version' => '0.9.5 RC2'
+    'require_frog_version' => '0.9.5'
 ));
 
 Plugin::addController('skeleton', 'Skeleton', 'administrator', false);
\ No newline at end of file
diff --git a/updating.txt b/updating.txt
index 99e1453..f38041d 100644
--- a/updating.txt
+++ b/updating.txt
@@ -31,9 +31,11 @@ have a full backup!
 Note: consider testing this upgrade process on a local test system before
       upgrading your production system.
 
+PLEASE READ THROUGH ALL OF THE STEPS BEFORE STARTING THE PROCEDURE.
+
 1. Create a FULL backup of your database. (structure and data)
 
-2. Create a FULL backup of your files.
+2. Create a FULL backup of your all your files. (including config.php)
 
 3. Download and unzip Frog 0.9.5 to a temporary directory.
 
@@ -41,15 +43,19 @@ Note: consider testing this upgrade process on a local test system before
     - The "public" directory.
     - The config.php file.
 
-5. Remove ALL the files of your old Frog 0.9.4 installation EXCEPT the "public"
-   directory. (and except any custom files you may have added offcourse)
+5. Login to the admin section of your 0.9.4 installation and disable all plugins.
+   (plugins generally shouldn't remove data from the database when being
+    disabled, so this shouldn't be a problem.)
+
+6. Remove ALL the files of your old Frog 0.9.4 installation EXCEPT the "public"
+   directory. (and except any custom files you may have added of course)
 
-6. Copy/upload ALL files from the temporary directory to your old 0.9.4 Frog
+7. Copy/upload ALL files from the temporary directory to your old 0.9.4 Frog
    installation's directory.
 
-7. Copy over the original config.php file.
+8. Copy the original config.php file to your new installation.
 
-8. Run the following SQL commands on your Frog database after adding a prefix to
+9. Run the following SQL commands on your Frog database after adding a prefix to
    the table names if necessary:
 
     ### NOTE: MYSQL commands, but SQLite commands should be almost the same.
@@ -67,11 +73,11 @@ Note: consider testing this upgrade process on a local test system before
     ALTER TABLE `setting`
         MODIFY `value` text NOT NULL DEFAULT '' COMMENT '' COLLATE utf8_general_ci;
 
-9. Enable the new htaccess file by removing the underscore.
+10. Enable the new htaccess file by removing the underscore.
 
-10. Check the new htaccess file settings against your old htaccess file.
+11. Check the new htaccess file settings against your old htaccess file.
 
-11. Lastly, you need to add some options to the config.php file that were added
+12. Lastly, you need to add some options to the config.php file that were added
     in Frog 0.9.5:
 
     // Should Frog check for updates on Frog itself and the installed plugins?
@@ -80,18 +86,29 @@ Note: consider testing this upgrade process on a local test system before
     // The number of seconds before the check for a new Frog version times out in case of problems.
     define('CHECK_TIMEOUT', 3);
 
-12. That should be it! Test out your new Frog 0.9.5 system.
+13. Re-install any old plugins that your Frog installation were using.
+
+14. Re-enable the plugins one-by-one, each time checking your site remains working.
+
+15. That should be it! Test out your new Frog 0.9.5 system.
     Remember to remove the write permissions from config.php, otherwise, Frog
     will complain.
 
-## NOTES ##
+## TROUBLESHOOTING / NOTES ##
+
+- If you don't see your old comments in the administration area, try disabling and
+  then re-enabling the comment plugin.
 
-- The plugin system was changed in Frog 0.9.5 so download and install plugins
-  that are compatible with Frog 0.9.5.
+- The plugin system was changed in Frog 0.9.5 so try to download and install
+  plugins that are compatible with Frog 0.9.5. Older plugins may or may not work.
 
-- The public directory now contains a themes subdirectory.
+- The public directory now contains a themes subdirectory in a default installation.
   It is advised that all themes for Frog follow the same approach as the
   Normal theme.
 
 - It is advised to always use the htaccess file. You can dis/enable the url
   rewriting by setting RewriteEngine to On/Off.
+
+- Please be very aware that this upgrade procedure DID NOT TOUCH or upgrade your
+  "public" directory. It also DID NOT ALTER or upgrade any data in the database.
+  This means you're still using a pre-0.9.5 Normal theme.