diff --git a/ChangeLog b/ChangeLog
index d155cffe0..75b274ba7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,7 @@ phpMyAdmin - ChangeLog
 $Id$
 $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $
 
-3.1.0.0 (not yet released)
+3.1.0.0 (2008-11-28)
 + [auth] Support for Swekey hardware authentication,
   see http://phpmyadmin.net/auth_key
 - bug #2046883 [core] Notices about deprecated dl() (so stop using it)
@@ -44,7 +44,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #2315549 [import] fclose() error with "Create PHP code"
 + [lang] Polish update, thanks to Jakub Wilk 
 
-3.0.2.0 (not yet released)
+3.0.2.0 (not released)
 - [lang] Italian update, thanks to Luca and fantu
 - bug #2107583 [GUI] Leading newline truncated, thanks to Isart Montane
 - bug #2222230 [import] Assigning a value in import.php, thanks to
diff --git a/Documentation.html b/Documentation.html
index f9533045a..efe8bcab2 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 3.1.0-rc1 - Documentation</title>
+    <title>phpMyAdmin 3.1.0 - 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 3.1.0-rc1 Documentation</h1>
+<h1>phpMyAdmin 3.1.0 Documentation</h1>
 
 <ul><li><a href="http://www.phpmyadmin.net/">
             phpMyAdmin homepage</a></li>
diff --git a/README b/README
index e42fd5e9a..2647f71df 100644
--- a/README
+++ b/README
@@ -5,8 +5,8 @@ phpMyAdmin - Readme
 
   A set of PHP-scripts to manage MySQL over the web.
 
-  Version 3.1.0-rc1
-  -----------------
+  Version 3.1.0
+  -------------
   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 abae3536f..f92bf81bb 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -85,7 +85,7 @@ class PMA_Config
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '3.1.0-rc1');
+        $this->set('PMA_VERSION', '3.1.0');
         /**
          * @deprecated
          */
diff --git a/translators.html b/translators.html
index 8406d5fc1..e9429452a 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=utf-8" />
-    <title>phpMyAdmin 3.1.0-rc1 - Official translators</title>
+    <title>phpMyAdmin 3.1.0 - 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 3.1.0-rc1 official translators list</h1>
+<h1>phpMyAdmin 3.1.0 official translators list</h1>
 
 <p> Here is the list of the &quot;official translators&quot; of
     phpMyAdmin.</p>