diff --git a/ChangeLog b/ChangeLog
index 1fbb26dc6..bb9681bed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,13 @@ phpMyAdmin - ChangeLog
 $Id$
 $HeadURL$
 
+2006-10-19 Michal Čihař  <michal@cihar.com>
+    * db_import.php, db_details.php, db_details_export.php,
+      db_details_structure.php, db_details_qbe.php, db_operations.php,
+      sql.php, libraries/db_info.inc.php, libraries/mult_submits.inc.php,
+      libraries/header.inc.php, libraries/db_details_db_info.inc.php: Rename
+      db_details_db_info.inc.php to db_info.inc.php.
+
 2006-10-18 Marc Delisle  <lem9@users.sourceforge.net>
     * db_operations.php, libraries/Table.class.php: bug #1567316,
       renaming a db containing a view
diff --git a/db_details.php b/db_details.php
index 28feab725..226b02c90 100644
--- a/db_details.php
+++ b/db_details.php
@@ -14,7 +14,7 @@ require_once './libraries/sql_query_form.lib.php';
  * Gets informations about the database and, if it is empty, move to the
  * "db_details_structure.php" script where table can be created
  */
-require('./libraries/db_details_db_info.inc.php');
+require('./libraries/db_info.inc.php');
 if ( $num_tables == 0 && empty( $db_query_force ) ) {
     $sub_part   = '';
     $is_info    = TRUE;
diff --git a/db_details_export.php b/db_details_export.php
index f45d3f6b0..40c6f61c5 100644
--- a/db_details_export.php
+++ b/db_details_export.php
@@ -5,9 +5,9 @@
  * dumps a database
  *
  * @uses    libraries/db_details_common.inc.php
- * @uses    libraries/db_details_db_info.inc.php
+ * @uses    libraries/db_info.inc.php
  * @uses    libraries/display_export.lib.php
- * @uses    $tables     from libraries/db_details_db_info.inc.php
+ * @uses    $tables     from libraries/db_info.inc.php
  */
 
 /**
@@ -18,7 +18,7 @@ require_once('./libraries/common.lib.php');
 $sub_part  = '_export';
 require_once('./libraries/db_details_common.inc.php');
 $url_query .= '&amp;goto=db_details_export.php';
-require_once('./libraries/db_details_db_info.inc.php');
+require_once('./libraries/db_info.inc.php');
 
 /**
  * Displays the form
diff --git a/db_details_qbe.php b/db_details_qbe.php
index 2f29aa045..3a09fc7ce 100644
--- a/db_details_qbe.php
+++ b/db_details_qbe.php
@@ -35,7 +35,7 @@ if (isset($_REQUEST['submit_sql'])
     require './libraries/db_details_common.inc.php';
     $url_query .= '&amp;goto=db_details_qbe.php';
     $url_params['goto'] = 'db_details_qbe.php';
-    require './libraries/db_details_db_info.inc.php';
+    require './libraries/db_info.inc.php';
 }
 
 if (isset($_REQUEST['submit_sql'])
diff --git a/db_details_structure.php b/db_details_structure.php
index 359a7ad31..e76b0da9a 100644
--- a/db_details_structure.php
+++ b/db_details_structure.php
@@ -23,7 +23,7 @@ if (empty($is_info)) {
 
     // Gets the database structure
     $sub_part = '_structure';
-    require './libraries/db_details_db_info.inc.php';
+    require './libraries/db_info.inc.php';
 }
 
 // 1. No tables
diff --git a/db_import.php b/db_import.php
index 618d4862c..2a84d6b09 100644
--- a/db_import.php
+++ b/db_import.php
@@ -8,7 +8,7 @@ require_once('./libraries/common.lib.php');
  * Gets tables informations and displays top links
  */
 require('./libraries/db_details_common.inc.php');
-require('./libraries/db_details_db_info.inc.php');
+require('./libraries/db_info.inc.php');
 
 $import_type = 'database';
 require('./libraries/display_import.lib.php');
diff --git a/db_operations.php b/db_operations.php
index 6463555de..3c1094eb5 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -185,7 +185,7 @@ if (empty($is_info)) {
 
     // Gets the database structure
     $sub_part = '_structure';
-    require './libraries/db_details_db_info.inc.php';
+    require './libraries/db_info.inc.php';
     echo "\n";
 }
 
diff --git a/libraries/db_details_db_info.inc.php b/libraries/db_info.inc.php
similarity index 100%
rename from libraries/db_details_db_info.inc.php
rename to libraries/db_info.inc.php
diff --git a/libraries/header.inc.php b/libraries/header.inc.php
index a68b9b005..9b3457d4d 100644
--- a/libraries/header.inc.php
+++ b/libraries/header.inc.php
@@ -242,7 +242,7 @@ if (empty($GLOBALS['is_header_sent'])) {
                 $cfgRelation = PMA_getRelationsParam();
 
                 // Get additional information about tables for tooltip is done
-                // in libraries/db_details_db_info.inc.php only once
+                // in libraries/db_info.inc.php only once
                 if ($cfgRelation['commwork']) {
                     $comment = PMA_getComments( $GLOBALS['db'] );
 
diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php
index 7d555d53d..04ffe20f9 100644
--- a/libraries/mult_submits.inc.php
+++ b/libraries/mult_submits.inc.php
@@ -132,7 +132,7 @@ if ( !empty($submit_mult) && !empty($what)) {
         require('./libraries/tbl_properties_table_info.inc.php');
     } elseif (isset($db) && strlen($db)) {
         require('./libraries/db_details_common.inc.php');
-        require('./libraries/db_details_db_info.inc.php');
+        require('./libraries/db_info.inc.php');
     }
     // Builds the query
     $full_query     = '';
diff --git a/sql.php b/sql.php
index f535b9596..e2265223c 100644
--- a/sql.php
+++ b/sql.php
@@ -671,7 +671,7 @@ else {
             require './libraries/tbl_properties_links.inc.php';
         } elseif (isset($db) && strlen($db)) {
             require './libraries/db_details_common.inc.php';
-            require './libraries/db_details_db_info.inc.php';
+            require './libraries/db_info.inc.php';
         } else {
             require './libraries/server_common.inc.php';
             require './libraries/server_links.inc.php';