diff --git a/ChangeLog b/ChangeLog
index 8c2949f13..403583824 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,7 @@ phpMyAdmin - ChangeLog
 $Id$
 $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $
 
-2.11.5.0 (not yet released)
+2.11.5.0 (2008-03-01)
 - bug #1862661 [GUI] Warn about rename deleting database 
 - bug #1866041 [interface] Incorrect sorting with AS 
 - bug #1871038 [import] Notice: undefined variable first_sql_delimiter 
@@ -26,8 +26,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
   thanks to Jürgen Wind - windkiel
 - bug [GUI] Do not display the database name used by the previous user,
   thanks to Ronny Görner
-- bug [core] Remove cookies from $_REQUEST for better coexistence with
-  other applications, thanks to Richard Cunningham
+- bug [security] Remove cookies from $_REQUEST for better coexistence with
+  other applications, thanks to Richard Cunningham. See PMASA-2008-1.
 
 2.11.4.0 (2008-01-12)
 - bug #1843428 [GUI] Space issue with DROP/DELETE/ALTER TABLE 
diff --git a/Documentation.html b/Documentation.html
index 19883f114..f4a02e393 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -11,7 +11,7 @@
     <link rel="icon" href="./favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-    <title>phpMyAdmin 2.11.5-rc2 - Documentation</title>
+    <title>phpMyAdmin 2.11.5 - Documentation</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
@@ -33,7 +33,7 @@
     <li><a href="#glossary">Glossary</a></li>
 </ul>
 
-<h1>phpMyAdmin 2.11.5-rc2 Documentation</h1>
+<h1>phpMyAdmin 2.11.5 Documentation</h1>
 
 <ul><li><a href="http://www.phpmyadmin.net/">
             phpMyAdmin homepage</a></li>
diff --git a/README b/README
index 7d6488cf3..c00093839 100644
--- a/README
+++ b/README
@@ -5,8 +5,8 @@ phpMyAdmin - Readme
 
   A set of PHP-scripts to manage MySQL over the web.
 
-  Version 2.11.5-rc2
-  ------------------
+  Version 2.11.5
+  --------------
   http://www.phpmyadmin.net/
 
     Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com>
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index e40fbb9ba..2b0ce1965 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -85,7 +85,7 @@ class PMA_Config
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '2.11.5-rc2');
+        $this->set('PMA_VERSION', '2.11.5');
         /**
          * @deprecated
          */
diff --git a/translators.html b/translators.html
index 280afb353..a30b500c1 100644
--- a/translators.html
+++ b/translators.html
@@ -8,7 +8,7 @@
     <link rel="icon" href="./favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-    <title>phpMyAdmin 2.11.5-rc2 - Official translators</title>
+    <title>phpMyAdmin 2.11.5 - Official translators</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
@@ -31,7 +31,7 @@
     <li><a href="Documentation.html#glossary">Glossary</a></li>
 </ul>
 
-<h1>phpMyAdmin 2.11.5-rc2 official translators list</h1>
+<h1>phpMyAdmin 2.11.5 official translators list</h1>
 
 <p> Here is the list of the &quot;official translators&quot; of
     phpMyAdmin.</p>