diff --git a/ChangeLog b/ChangeLog
index aad6f765c..e02e54175 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ $Source$
 
 2002-03-22 Marc Delisle  <lem9@users.sourceforge.net>
 	* finnish, norwegian updates
+	* ### 2.2.5 released ###
 
 2002-03-22 Loïc Chapeaux  <lolo@phpheaven.net>
 	* db_details.php3, lines 383-390: removed the submit button for actions on
diff --git a/Documentation.html b/Documentation.html
index 3ad4c250b..7baa0564a 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -6,7 +6,7 @@
 
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-    <title>phpMyAdmin 2.2.5-rc2 - Documentation</title>
+    <title>phpMyAdmin 2.2.5 - Documentation</title>
     <style type="text/css">
     <!--
     .navigation {
@@ -75,7 +75,7 @@
 
 <body bgcolor="#FFFFFF">
 <a name="top"></a>
-<h1>phpMyAdmin 2.2.5-rc2 Documentation</h1>
+<h1>phpMyAdmin 2.2.5 Documentation</h1>
 
 
 <!-- TOP MENU -->
diff --git a/Documentation.txt b/Documentation.txt
index d2f1ddfa8..f5c481f32 100644
--- a/Documentation.txt
+++ b/Documentation.txt
@@ -1,5 +1,5 @@
 
-                      phpMyAdmin 2.2.5-rc1 Documentation
+                        phpMyAdmin 2.2.5 Documentation
                                        
      * Official phpMyAdmin project homepage    [
        http://www.phpwizard.net/projects/phpMyAdmin/ ]
@@ -9,8 +9,8 @@
           + Version history: ChangeLog
           + General notes: README
           + License: LICENSE
-     * Documentation version: $Id: Documentation.html,v 1.165 2002/03/11
-       17:10:45 lem9 Exp $
+     * Documentation version: $Id: Documentation.html,v 1.169 2002/03/22
+       12:04:53 loic1 Exp $
    ______________________________________________________________________
    
    Top  -  Requirements  -  Introduction  -  Installation  -
@@ -624,6 +624,11 @@ FAQ - Frequently Asked Questions
    If PHP does not have read/write access to its upload_tmp_dir, it
    cannot access the uploaded query.
    
+   I get an error 'No SQL query' when trying to submit a query from the
+   convenient text area.
+   Check the post_max_size directive from your php configuration file and
+   try to increase it.
+   
    I have problems with mysql.user field names.
    In older MySQL versions, the User and Password fields were named user
    and password. Please modify your field names to align with current
@@ -1000,7 +1005,7 @@ P
 Kristof Hamann, Thomas Kläger, Lubos Klokner, Martin Marconcini,
 Girish Nair, David Nordenberg, Bernard M. Piller, Laurent Haas,
 "Sakamoto", Yuval Sarna, www.securereality.com.au,
-Peter Svec, Michael Tacelosky, Luís V., Daniel Villanueva, Vinay,
+Alvar Soome, Peter Svec, Michael Tacelosky, Luís V., Daniel Villanueva, Vinay,
 Ignacio Vazquez-Abrams, Chee Wai, Jakub Wilk, Thomas Michael Winningham.
 
 
diff --git a/libraries/defines.lib.php3 b/libraries/defines.lib.php3
index 725fecdf5..c1aeff103 100644
--- a/libraries/defines.lib.php3
+++ b/libraries/defines.lib.php3
@@ -1,7 +1,6 @@
 <?php
 /* $Id$ */
 
-
 /**
  * DEFINES VARIABLES & CONSTANTS
  * Overview:
@@ -17,7 +16,7 @@
  */
 // phpMyAdmin release
 if (!defined('PMA_VERSION')) {
-    define('PMA_VERSION', '2.2.5-dev');
+    define('PMA_VERSION', '2.2.5');
 }
 
 // php version
