diff --git a/.cvsignore b/.cvsignore
index 754607f2d..4665b803e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,4 @@
-config.inc.developer.php3
+config.inc.developer.php
 phpmyadmin.wpj
 upload
 save
diff --git a/ChangeLog b/ChangeLog
index 0fc04360b..180b95cbd 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-11-18 Michal Cihar  <nijel@users.sourceforge.net>
+    * almost EVERYTHING: The big rename from php3 to php.
+
 2003-11-18 Michal Cihar  <nijel@users.sourceforge.net>
     * read_dump.php3: Show result of last SHOW query when multiple queries.
     * scripts/create-release.sh: Generate also sizes of files, for
diff --git a/Documentation.html b/Documentation.html
index 6f0569013..fca23d48f 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -145,23 +145,14 @@
     end of lines character (&quot;<tt>\r</tt>&quot;).
 </p>
 
-<p>
-    <span class="important">Documentation warning:</span> when you see in this
-    document a <i>.php3</i> file extension, please transpose to <i>.php</i>
-    if you are using a kit with files having this extension.
-</p>
-
 <p><b>Quick Install:</b></p>
 <ol>
-    <li> Choose and download a distribution kit with the files having the
-         extension (<i>.php3</i> or <i>.php</i>) depending on the way your
-         web/PHP server interprets those extensions.</li>
     <li> Untar or unzip the distribution (be sure to unzip the subdirectories):
          <tt>tar -xzvf phpMyAdmin_x.x.x.tar.gz</tt> in your webserver's
          document root. If you don't have direct access to your document root,
          put the files in a directory on your local machine, and, after step 3,
          transfer the directory on your web server using, for example, ftp.</li>
-    <li> Open the file config.inc.php3 in your favorite editor and change
+    <li> Open the file config.inc.php in your favorite editor and change
          the values for host, user, password and authentication mode to fit
          your environment. Here, &quot;host&quot; means the MySQL server.
          Also insert the correct value for <tt>$cfg['PmaAbsoluteUri']</tt>.
@@ -175,7 +166,7 @@
          <a href="#faq">FAQ section</a> for additional
          information.</li>
     <li> Open the file
-         <i>&lt;www.your-host.com&gt;/&lt;your-install-dir&gt;/index.php3</i>
+         <i>&lt;www.your-host.com&gt;/&lt;your-install-dir&gt;/index.php</i>
          in your browser. phpMyAdmin should now display a welcome screen
          and your databases, or a login dialog if using HTTP or cookie
          authentication mode.</li>
@@ -186,14 +177,14 @@
          You can already use your phpMyAdmin to create the tables for you. Please be
          aware that you may have to have special (administrator) privileges to create
          the database and tables. After having imported the <i>create_tables.sql</i> file,
-         you should specify the table names in your config.inc.php3 file. The directives
+         you should specify the table names in your config.inc.php file. The directives
          used for that can be found in the <a href="#config">Configuration section</a>.</li>
 
 </ol>
 
 <p><b>Upgrading from an older version:</b></p>
 <ul>
-    <li>Please do not copy your older config.inc.php3 over the new one: it may
+    <li>Please do not copy your older config.inc.php over the new one: it may
         offer new configuration variables, and the new version may depend on
         these for normal behavior.  It is suggested instead to insert your site
         values in the new one.</li>
@@ -231,7 +222,7 @@
         columns)</i> &amp; <i>mysql.tables_priv (all columns except
         &quot;Grantor&quot; &amp; &quot;Timestamp&quot;) </i>tables.<br /> You
         must specify the details for the controluser in the
-        <i>config.inc.php3</i> file under the
+        <i>config.inc.php</i> file under the
         <tt>$cfg['Servers'][$i]['controluser']</tt>&amp;
         <tt>$cfg['Servers'][$i]['controlpass']</tt> settings.<br /> The
         following example assumes you want to use <tt>pma</tt> as the
@@ -341,7 +332,7 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON &lt;pma_db&gt;.* TO 'pma'@'localhost';
     you have modified.
 </p>
 
-<p>All configurable data is placed in <i>config.inc.php3</i>.</p>
+<p>All configurable data is placed in <i>config.inc.php</i>.</p>
 <dl>
     <dt><b>$cfg['PmaAbsoluteUri']</b> string</dt>
     <dd>
@@ -507,7 +498,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
                 'config' authentication
                 (<tt>$auth_type&nbsp;=&nbsp;'config'</tt>) is the plain old
                 way: username and password are stored in
-                <i>config.inc.php3</i>.
+                <i>config.inc.php</i>.
             </li>
             <li>
                 'cookie' authentication mode
@@ -1325,27 +1316,27 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
     <dt><b>$cfg['DefaultTabServer'] </b>string</dt>
     <dd>
         Defines the tab displayed by default on server view. Possible
-        values: &quot;main.php3&quot; (recommended for multi-user setups),
-        &quot;server_databases.php3&quot;, &quot;server_status.php3&quot;,
-        &quot;server_variables.php3&quot;, &quot;server_privileges.php3&quot;
-        or &quot;server_processlist.php3&quot;.
+        values: &quot;main.php&quot; (recommended for multi-user setups),
+        &quot;server_databases.php&quot;, &quot;server_status.php&quot;,
+        &quot;server_variables.php&quot;, &quot;server_privileges.php&quot;
+        or &quot;server_processlist.php&quot;.
         <br /><br />
     </dd>
 
     <dt><b>$cfg['DefaultTabDatabase'] </b>string</dt>
     <dd>
         Defines the tab displayed by default on database view. Possible
-        values: &quot;db_details_structure.php3&quot;,
-        &quot;db_details.php3&quot; or &quot;db_search.php3&quot;.
+        values: &quot;db_details_structure.php&quot;,
+        &quot;db_details.php&quot; or &quot;db_search.php&quot;.
         <br /><br />
     </dd>
 
     <dt><b>$cfg['DefaultTabTable'] </b>string</dt>
     <dd>
         Defines the tab displayed by default on table view. Possible
-        values: &quot;tbl_properties_structure.php3&quot;,
-        &quot;tbl_properties.php3&quot;, &quot;tbl_select.php3&quot; or
-        &quot;tbl_change.php3&quot;.
+        values: &quot;tbl_properties_structure.php&quot;,
+        &quot;tbl_properties.php&quot;, &quot;tbl_select.php&quot; or
+        &quot;tbl_change.php&quot;.
         <br /><br />
     </dd>
 
@@ -1378,7 +1369,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
     <dd>
         Defines the default language to use, if not browser-defined or
         user-defined.<br />
-        See the <i>select_lang.inc.php3</i> script to know the valid values for
+        See the <i>select_lang.inc.php</i> script to know the valid values for
         this setting.
         <br /><br />
     </dd>
@@ -1386,7 +1377,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
     <dt><b>$cfg['Lang'] </b>string</dt>
     <dd>
         Force: always use this language (must be defined in the
-        <i>select_lang.inc.php3</i> script).
+        <i>select_lang.inc.php</i> script).
         <br /><br />
     </dd>
 
@@ -1976,7 +1967,7 @@ options you can also specify strings to append/prepend to a string or the format
 want the output stored in.</p><br />
 
 <p>For a general overview of all available transformations and their options, you can
-consult your <i>&lt;www.your-host.com&gt;/&lt;your-install-dir&gt;/libraries/transformations/overview.php3</i>
+consult your <i>&lt;www.your-host.com&gt;/&lt;your-install-dir&gt;/libraries/transformations/overview.php</i>
 installation.</p>
 
 <p><br />For a tutorial on how to effectively use transformations, see our <a href="http://www.phpmyadmin.net/home_page/docs.php">Link section</a> on the official phpMyAdmin-homepage.</p>
@@ -1984,7 +1975,7 @@ installation.</p>
 <a name="transformationshowto"></a><br />
 <h3>[2. Usage]</h3>
 
-<p>Go to your tbl_properties.inc.php3 page (i.e. reached through clicking on the
+<p>Go to your tbl_properties.inc.php page (i.e. reached through clicking on the
 'properties' link for a table). There click on &quot;Change&quot; (or change
 icon) and there you will see three new fields at the end of the line. They are
 called 'MIME-type', 'Browser transformation' and 'Transformation options'.</p>
@@ -2046,7 +2037,7 @@ for many mimetypes. You can also use transforms on a different mimetype they whe
 for, but pay attention to option usage as well as what the transformation does to your
 field.</p><br />
 
-<p>There is a basic file called 'global.inc.php3'. This function can be included by
+<p>There is a basic file called 'global.inc.php'. This function can be included by
 any other transform function and provides some basic functions.</p><br />
 
 <p>There are 5 possible file names:</p>
@@ -2054,7 +2045,7 @@ any other transform function and provides some basic functions.</p><br />
 <ol>
 <li>A mimetype+subtype transform:<br /><br />
 
-    [mimetype]_[subtype]__[transform].inc.php3<br /><br />
+    [mimetype]_[subtype]__[transform].inc.php<br /><br />
 
     Please not that mimetype and subtype are separated via '_', which shall not be
     contained in their names. The transform function/filename may contain only
@@ -2065,12 +2056,12 @@ any other transform function and provides some basic functions.</p><br />
 
     <b>Example:</b><br /><br />
 
-    text_html__formatted.inc.php3<br />
+    text_html__formatted.inc.php<br />
     PMA_transform_text_html__formatted()</li>
 
 <li>A mimetype (w/o subtype) transform:<br /><br />
 
-    [mimetype]__[transform].inc.php3<br /><br />
+    [mimetype]__[transform].inc.php<br /><br />
 
     Please note that there are no single '_' characters.
     The transform function/filename may contain only characters which cause no problems
@@ -2080,12 +2071,12 @@ any other transform function and provides some basic functions.</p><br />
 
     <b>Example:</b><br /><br />
 
-    text__formatted.inc.php3<br />
+    text__formatted.inc.php<br />
     PMA_transform_text__formatted()</li>
 
 <li>A mimetype+subtype without specific transform function<br /><br />
 
-    [mimetype]_[subtype].inc.php3<br /><br />
+    [mimetype]_[subtype].inc.php<br /><br />
 
     Please note that there are no '__' characters in the filename. Do not use special
     characters in the filename causing problems with the file system.<br /><br />
@@ -2094,12 +2085,12 @@ any other transform function and provides some basic functions.</p><br />
 
     <b>Example:</b><br /><br />
 
-    text_plain.inc.php3<br />
+    text_plain.inc.php<br />
     (No function)</li>
 
 <li>A mimetype (w/o subtype) without specific transform function<br /><br />
 
-    [mimetype].inc.php3<br /><br />
+    [mimetype].inc.php<br /><br />
 
     Please note that there are no '_' characters in the filename. Do not use special
     characters in the filename causing problems with the file system.<br /><br />
@@ -2108,12 +2099,12 @@ any other transform function and provides some basic functions.</p><br />
 
     <b>Example:</b><br /><br />
 
-    text.inc.php3<br />
+    text.inc.php<br />
     (No function)</li>
 
 <li>A global transform function with no specific mimetype<br /><br />
 
-    global__[transform].inc.php3<br /><br />
+    global__[transform].inc.php<br /><br />
 
     The transform function will the be called 'PMA_transform_global__[transform]()'.<br /><br />
 
@@ -2133,7 +2124,7 @@ functions in the dropdown.</p><br />
 <p>Please see the libraries/transformations/TEMPLATE file for adding your own transform
 function. See the libraries/transformations/TEMPLATE_MIMETYPE for adding a mimetype
 without a transform function. Also note the introduction of a function description in
-the language files. For each function a $strTransformation_[filename without .inc.php3]
+the language files. For each function a $strTransformation_[filename without .inc.php]
 has to exist.</p><br />
 
 <p>You can use the template generator to generate new functions and entries in the
@@ -2183,7 +2174,7 @@ To create a new, empty mimetype please see libraries/transformations/template_ge
 <p>
     There are some known PHP bugs with output buffering and compression.<br />
     Try to set the <tt>$cfg['OBGzip']</tt> directive to <tt>FALSE</tt> in your
-    <i>config.inc.php or .php3</i> file and the
+    <i>config.inc.php</i> file and the
     <tt>zlib.output_compression</tt> directive to <tt>Off</tt> in your php
     configuration file.<br />
     Furthermore, we know about such problems connected to the release
@@ -2245,9 +2236,9 @@ To create a new, empty mimetype please see libraries/transformations/template_ge
 <p>
     This seems to be a PWS bug. Filippo Simoncini found a workaround (at this
     time there is no better fix): remove or comment the <tt>DOCTYPE</tt>
-    declarations (2 lines) from the scripts <i>header.inc.php3</i>,
-    <i>header_printview.inc.php3</i>, <i>index.php3</i>, <i>left.php3</i> and
-    <i>libraries/common.lib.php3</i>.
+    declarations (2 lines) from the scripts <i>header.inc.php</i>,
+    <i>header_printview.inc.php</i>, <i>index.php</i>, <i>left.php</i> and
+    <i>libraries/common.lib.php</i>.
 </p>
 
 <h4>
@@ -2520,12 +2511,12 @@ To create a new, empty mimetype please see libraries/transformations/template_ge
 
 <h4>
     [1.27] I get empty page when I want to view huge page (eg.
-    db_details_structure.php3 with plenty of tables).
+    db_details_structure.php with plenty of tables).
 </h4>
 <p>
     This is a <a href="http://bugs.php.net/21079">PHP bug</a> that occur when
     GZIP output buffering enabled. If you turn off it (by <code>$cfg['OBGzip']
-    = FALSE</code> in config.inc.php3), it should work. This bug will be fixed
+    = FALSE</code> in config.inc.php), it should work. This bug will be fixed
     in PHP 5.0.0.
 </p>
 
@@ -2589,7 +2580,7 @@ To create a new, empty mimetype please see libraries/transformations/template_ge
     headers already sent by ...&quot; is displayed, what's the problem?
 </h4>
 <p>
-    Edit your <i>config.inc.php or .php3</i> file and ensure there is nothing
+    Edit your <i>config.inc.php or .php</i> file and ensure there is nothing
     (I.E. no blank lines, no spaces, no characters...) neither before the
     <tt>&lt;?php</tt> tag at the beginning, neither after the <tt>?&gt;</tt>
     tag at the end.
@@ -2640,7 +2631,7 @@ To create a new, empty mimetype please see libraries/transformations/template_ge
         Then, you need to tell PHP to use this socket.<br />Assuming you are
         using PHP 3.0.10 or better, you can specify the socket to use when you
         open the connection. To do this in phpMyAdmin, you need to complete the
-        socket information in the config.inc.php3.<br />
+        socket information in the config.inc.php.<br />
         For example:
         <tt>$cfg['Servers'][$i]['socket']&nbsp;=&nbsp;'/tmp/mysql.sock';</tt><br /><br />
         Please also make sure that the permissions of this file allow to be readable
@@ -2796,7 +2787,7 @@ To create a new, empty mimetype please see libraries/transformations/template_ge
 <p>
     Due to a surrounding form-container (for multi-row delete checkboxes), no nested forms can be put inside the table where
     phpMyAdmin displays the results. You can, however, use any form inside of a table if keep the parent form-container with
-    the target to tbl_row_delete.php3 and just put your own input-elements inside. If you use a custom submit input field, the
+    the target to tbl_row_delete.php and just put your own input-elements inside. If you use a custom submit input field, the
     form will submit itself to the displaying page again, where you can validate the $HTTP_POST_VARS in a transformation.
 
     For a tutorial on how to effectively use transformations, see our <a href="http://www.phpmyadmin.net/home_page/docs.php">Link section</a>
@@ -2853,7 +2844,7 @@ To create a new, empty mimetype please see libraries/transformations/template_ge
 </p>
 <ul>
     <li>
-        Your <i>config.inc.php3</i> file should be <tt>chmod 660</tt>.
+        Your <i>config.inc.php</i> file should be <tt>chmod 660</tt>.
     </li>
     <li>
         All your phpMyAdmin files should be chown phpmy.apache, where phpmy
@@ -2862,7 +2853,7 @@ To create a new, empty mimetype please see libraries/transformations/template_ge
     </li>
     <li>
         You should use PHP safe mode, to protect from other users that try
-        to include your <i>config.inc.php3</i> in their scripts.
+        to include your <i>config.inc.php</i> in their scripts.
     </li>
 </ul>
 
@@ -3527,7 +3518,7 @@ To create a new, empty mimetype please see libraries/transformations/template_ge
 </h4>
 <p>
     Always use the current CVS version of your language file.
-    For a new language, start from <i>english-iso-8859-1.inc.php3</i>. If you
+    For a new language, start from <i>english-iso-8859-1.inc.php</i>. If you
     don't  know how to get the CVS version, please ask one of the developers.
     <br />
     Please note that we try not to use HTML entities like &amp;eacute; in
@@ -3650,15 +3641,15 @@ To create a new, empty mimetype please see libraries/transformations/template_ge
 </p>
 <ul>
     <li>
-        All files include <i>header.inc.php3</i> (layout),
-        <i>libraries/common.lib.php3</i> (common functions) and
-        <i>config.inc.php3</i>.
+        All files include <i>header.inc.php</i> (layout),
+        <i>libraries/common.lib.php</i> (common functions) and
+        <i>config.inc.php</i>.
         <br />
-        All configuration data belongs in <i>config.inc.php3</i>. Please keep
+        All configuration data belongs in <i>config.inc.php</i>. Please keep
         it free from other code.
         <br />
         Commonly used functions should be added to
-        <i>libraries/common.lib.php3</i> and more specific ones may be added
+        <i>libraries/common.lib.php</i> and more specific ones may be added
         within a library stored into the <i>libraries</i> sub-directory.
     </li>
     <li>
@@ -3672,12 +3663,12 @@ To create a new, empty mimetype please see libraries/transformations/template_ge
     </li>
     <li>
         Please try to keep up the file-naming conventions. Table-related stuff
-        goes to <i>tbl_*.php3</i>, db-related code to <i>db_*.php3</i>,
-        server-related tools to <i>server_*.php3</i> and so on.
+        goes to <i>tbl_*.php</i>, db-related code to <i>db_*.php</i>,
+        server-related tools to <i>server_*.php</i> and so on.
     </li>
     <li>
         Please don't use verbose strings in your code, instead add the string
-        (at least) to <i>english-iso-8859-1.inc.php3</i> and print() it out.
+        (at least) to <i>english-iso-8859-1.inc.php</i> and print() it out.
     </li>
     <li>
         If you want to be really helpful, write an entry for the ChangeLog.
diff --git a/Documentation.txt b/Documentation.txt
index 7399bb9e1..73ae4000f 100644
--- a/Documentation.txt
+++ b/Documentation.txt
@@ -14,8 +14,8 @@
           + Version history: ChangeLog
           + General notes: README
           + License: LICENSE
-     * Documentation version: $Id: Documentation.html,v 1.510 2003/10/16
-       15:22:11 nijel Exp $
+     * Documentation version: $Id: Documentation.html,v 1.518 2003/11/07
+       18:01:55 lem9 Exp $
 
 Requirements
 
@@ -75,35 +75,28 @@ Installation
    scripts before uploading them to your server, as PHP seems not to like
    Mac-style end of lines character ("\r").
 
-   Documentation warning: when you see in this document a .php3 file
-   extension, please transpose to .php if you are using a kit with files
-   having this extension.
-
    Quick Install:
-    1. Choose and download a distribution kit with the files having the
-       extension (.php3 or .php) depending on the way your web/PHP server
-       interprets those extensions.
-    2. Untar or unzip the distribution (be sure to unzip the
+    1. Untar or unzip the distribution (be sure to unzip the
        subdirectories): tar -xzvf phpMyAdmin_x.x.x.tar.gz in your
        webserver's document root. If you don't have direct access to your
        document root, put the files in a directory on your local machine,
        and, after step 3, transfer the directory on your web server
        using, for example, ftp.
-    3. Open the file config.inc.php3 in your favorite editor and change
+    2. Open the file config.inc.php in your favorite editor and change
        the values for host, user, password and authentication mode to fit
        your environment. Here, "host" means the MySQL server. Also insert
        the correct value for $cfg['PmaAbsoluteUri']. Have a look at
        Configuration section for an explanation of all values.
-    4. It is recommended that you protect the directory in which you
+    3. It is recommended that you protect the directory in which you
        installed phpMyAdmin (unless it's on a closed intranet, or you
        wish to use HTTP or cookie authentication), for example with
        HTTP-AUTH (in a .htaccess file). See the FAQ section for
        additional information.
-    5. Open the file <www.your-host.com>/<your-install-dir>/index.php3 in
+    4. Open the file <www.your-host.com>/<your-install-dir>/index.php in
        your browser. phpMyAdmin should now display a welcome screen and
        your databases, or a login dialog if using HTTP or cookie
        authentication mode.
-    6. For a whole set of new features (bookmarks, comments, SQL-history,
+    5. For a whole set of new features (bookmarks, comments, SQL-history,
        PDF-generation, field contents transformation, etc.) you need to
        create a set of tables in your database. Please look at your
        scripts/ directory, where you should find a file called
@@ -112,12 +105,12 @@ Installation
        create the tables for you. Please be aware that you may have to
        have special (administrator) privileges to create the database and
        tables. After having imported the create_tables.sql file, you
-       should specify the table names in your config.inc.php3 file. The
+       should specify the table names in your config.inc.php file. The
        directives used for that can be found in the Configuration
        section.
 
    Upgrading from an older version:
-     * Please do not copy your older config.inc.php3 over the new one: it
+     * Please do not copy your older config.inc.php over the new one: it
        may offer new configuration variables, and the new version may
        depend on these for normal behavior. It is suggested instead to
        insert your site values in the new one.
@@ -145,7 +138,7 @@ Installation
        except "Password"), mysql.db (all columns) & mysql.tables_priv
        (all columns except "Grantor" & "Timestamp") tables.
        You must specify the details for the controluser in the
-       config.inc.php3 file under the $cfg['Servers'][$i]['controluser']&
+       config.inc.php file under the $cfg['Servers'][$i]['controluser']&
        $cfg['Servers'][$i]['controlpass'] settings.
        The following example assumes you want to use pma as the
        controluser and pmapass as the controlpass, but this is only an
@@ -234,7 +227,7 @@ Configuration
    the *nix end of line character ("\n") in your text editor before
    registering a script you have modified.
 
-   All configurable data is placed in config.inc.php3.
+   All configurable data is placed in config.inc.php.
 
    $cfg['PmaAbsoluteUri'] string
           Sets here the complete URL (with full path) to your phpMyAdmin
@@ -353,7 +346,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
           for this server.
 
           + 'config' authentication ($auth_type = 'config') is the plain
-            old way: username and password are stored in config.inc.php3.
+            old way: username and password are stored in config.inc.php.
           + 'cookie' authentication mode ($auth_type = 'cookie') as
             introduced in 2.2.3 allows you to log in as any valid MySQL
             user with the help of cookies. Log name and password are
@@ -384,10 +377,18 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
           since the latter does not need to send MySQL requests to build
           the available database list. But it does not replace the
           privileges rules of the MySQL database server. If set, it just
-          means only these databases will be displayed but not at all
+          means only these databases will be displayed but not that all
           other databases can't be used.
           An example of using more that one database:
           $cfg['Servers'][$i]['only_db'] = array('db1', 'db2');
+          As of phpMyAdmin 2.5.5 the order inside the array is used for
+          sorting the databases in the left frame, so that you can
+          individually arrange your databases.
+          If you want to have certain tables at the top, but don't care
+          about the others, you do not need to specify all other
+          databases. Use: $cfg['Servers'][$i]['only_db'] = array('db3',
+          'db4', '*'); instead to tell phpMyAdmin that it should display
+          db3 and db4 on top, and the rest in alphabetic order.
 
    $cfg['Servers'][$i]['verbose'] string
           Only useful when using phpMyAdmin with multiple server entries.
@@ -884,20 +885,20 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
 
    $cfg['DefaultTabServer'] string
           Defines the tab displayed by default on server view. Possible
-          values: "main.php3" (recommended for multi-user setups),
-          "server_databases.php3", "server_status.php3",
-          "server_variables.php3", "server_privileges.php3" or
-          "server_processlist.php3".
+          values: "main.php" (recommended for multi-user setups),
+          "server_databases.php", "server_status.php",
+          "server_variables.php", "server_privileges.php" or
+          "server_processlist.php".
 
    $cfg['DefaultTabDatabase'] string
           Defines the tab displayed by default on database view. Possible
-          values: "db_details_structure.php3", "db_details.php3" or
-          "db_search.php3".
+          values: "db_details_structure.php", "db_details.php" or
+          "db_search.php".
 
    $cfg['DefaultTabTable'] string
           Defines the tab displayed by default on table view. Possible
-          values: "tbl_properties_structure.php3", "tbl_properties.php3",
-          "tbl_select.php3" or "tbl_change.php3".
+          values: "tbl_properties_structure.php", "tbl_properties.php",
+          "tbl_select.php" or "tbl_change.php".
 
    $cfg['MySQLManualBase'] string
           If set to an URL which points to the MySQL documentation (type
@@ -918,12 +919,12 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
    $cfg['DefaultLang'] string
           Defines the default language to use, if not browser-defined or
           user-defined.
-          See the select_lang.inc.php3 script to know the valid values
-          for this setting.
+          See the select_lang.inc.php script to know the valid values for
+          this setting.
 
    $cfg['Lang'] string
           Force: always use this language (must be defined in the
-          select_lang.inc.php3 script).
+          select_lang.inc.php script).
 
    $cfg['DefaultCharset'] string
           Default character set to use for recoding of MySQL queries.
@@ -1057,7 +1058,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
           lineup.
           The HeaderFlipType can be set to 'css' or 'faked'. When using
           'css' the rotation of the header for horizontalflipped is done
-          via CSS. If set to 'faked' PGP does the transformation for you,
+          via CSS. If set to 'faked' PHP does the transformation for you,
           but of course this does not look as good as CSS.
 
    $cfg['DefaultPropDisplay'] string
@@ -1340,14 +1341,14 @@ Transformations
    For a general overview of all available transformations and their
    options, you can consult your
    <www.your-host.com>/<your-install-dir>/libraries/transformations/overv
-   iew.php3 installation.
+   iew.php installation.
 
    For a tutorial on how to effectively use transformations, see our Link
    section on the official phpMyAdmin-homepage.
 
   [2. Usage]
 
-   Go to your tbl_properties.inc.php3 page (i.e. reached through clicking
+   Go to your tbl_properties.inc.php page (i.e. reached through clicking
    on the 'properties' link for a table). There click on "Change" (or
    change icon) and there you will see three new fields at the end of the
    line. They are called 'MIME-type', 'Browser transformation' and
@@ -1409,13 +1410,13 @@ Transformations
    different mimetype they where built for, but pay attention to option
    usage as well as what the transformation does to your field.
 
-   There is a basic file called 'global.inc.php3'. This function can be
+   There is a basic file called 'global.inc.php'. This function can be
    included by any other transform function and provides some basic
    functions.
 
    There are 5 possible file names:
     1. A mimetype+subtype transform:
-       [mimetype]_[subtype]__[transform].inc.php3
+       [mimetype]_[subtype]__[transform].inc.php
        Please not that mimetype and subtype are separated via '_', which
        shall not be contained in their names. The transform
        function/filename may contain only characters which cause no
@@ -1424,10 +1425,10 @@ Transformations
        The transform function will the be called
        'PMA_transform_[mimetype]_[subtype]__[transform]()'.
        Example:
-       text_html__formatted.inc.php3
+       text_html__formatted.inc.php
        PMA_transform_text_html__formatted()
     2. A mimetype (w/o subtype) transform:
-       [mimetype]__[transform].inc.php3
+       [mimetype]__[transform].inc.php
        Please note that there are no single '_' characters. The transform
        function/filename may contain only characters which cause no
        problems in the file system as well as the PHP function naming
@@ -1435,28 +1436,28 @@ Transformations
        The transform function will the be called
        'PMA_transform_[mimetype]__[transform]()'.
        Example:
-       text__formatted.inc.php3
+       text__formatted.inc.php
        PMA_transform_text__formatted()
     3. A mimetype+subtype without specific transform function
-       [mimetype]_[subtype].inc.php3
+       [mimetype]_[subtype].inc.php
        Please note that there are no '__' characters in the filename. Do
        not use special characters in the filename causing problems with
        the file system.
        No transformation function is defined in the file itself.
        Example:
-       text_plain.inc.php3
+       text_plain.inc.php
        (No function)
     4. A mimetype (w/o subtype) without specific transform function
-       [mimetype].inc.php3
+       [mimetype].inc.php
        Please note that there are no '_' characters in the filename. Do
        not use special characters in the filename causing problems with
        the file system.
        No transformation function is defined in the file itself.
        Example:
-       text.inc.php3
+       text.inc.php
        (No function)
     5. A global transform function with no specific mimetype
-       global__[transform].inc.php3
+       global__[transform].inc.php
        The transform function will the be called
        'PMA_transform_global__[transform]()'.
        Example:
@@ -1474,7 +1475,7 @@ Transformations
    libraries/transformations/TEMPLATE_MIMETYPE for adding a mimetype
    without a transform function. Also note the introduction of a function
    description in the language files. For each function a
-   $strTransformation_[filename without .inc.php3] has to exist.
+   $strTransformation_[filename without .inc.php] has to exist.
 
    You can use the template generator to generate new functions and
    entries in the language file.
@@ -1484,6 +1485,20 @@ Transformations
    empty mimetype please see
    libraries/transformations/template_generator_mimetype.sh.
 
+   A transform function always gets passed three variables:
+    1. $buffer - Contains the text inside of the column. This is the
+       text, you want to transform.
+    2. $options - Contains any user-passed options to a transform
+       function as an array.
+    3. $meta - Contains an object with field information to your column.
+       The data is drawn from the output of the mysql_fetch_field()
+       function. This means, all object properties described on the
+       manual page are available in this variable and can be used to
+       transform a field accordingly to unsigned/zerofill/not_null/...
+       properties.
+       The $meta->mimetype variable contains the original MIME-type of
+       the field (i.e. 'text/plain', 'image/jpeg' etc.)
+
 FAQ - Frequently Asked Questions
 
    Server  -  Configuration  -  Limitations  -  Multi-user  -  Browsers
@@ -1501,8 +1516,8 @@ FAQ - Frequently Asked Questions
 
    There are some known PHP bugs with output buffering and compression.
    Try to set the $cfg['OBGzip'] directive to FALSE in your
-   config.inc.php or .php3 file and the zlib.output_compression directive
-   to Off in your php configuration file.
+   config.inc.php file and the zlib.output_compression directive to Off
+   in your php configuration file.
    Furthermore, we know about such problems connected to the release
    candidates of PHP 4.2.0 (tested with PHP 4.2.0 RC1 to RC4) together
    with MS Internet Explorer. Please upgrade to the release version PHP
@@ -1545,9 +1560,9 @@ FAQ - Frequently Asked Questions
 
    This seems to be a PWS bug. Filippo Simoncini found a workaround (at
    this time there is no better fix): remove or comment the DOCTYPE
-   declarations (2 lines) from the scripts header.inc.php3,
-   header_printview.inc.php3, index.php3, left.php3 and
-   libraries/common.lib.php3.
+   declarations (2 lines) from the scripts header.inc.php,
+   header_printview.inc.php, index.php, left.php and
+   libraries/common.lib.php.
 
     [1.7] How can I GZip or Bzip a dump or a CSV export. It does not seem to
     work.
@@ -1734,10 +1749,10 @@ FAQ - Frequently Asked Questions
    should work.
 
     [1.27] I get empty page when I want to view huge page (eg.
-    db_details_structure.php3 with plenty of tables).
+    db_details_structure.php with plenty of tables).
 
    This is a PHP bug that occur when GZIP output buffering enabled. If
-   you turn off it (by $cfg['OBGzip'] = FALSE in config.inc.php3), it
+   you turn off it (by $cfg['OBGzip'] = FALSE in config.inc.php), it
    should work. This bug will be fixed in PHP 5.0.0.
 
     [1.28] My MySQL server sometimes refuses queries and returns the message
@@ -1778,7 +1793,7 @@ FAQ - Frequently Asked Questions
     [2.1] The error message "Warning: Cannot add header information - headers
     already sent by ..." is displayed, what's the problem?
 
-   Edit your config.inc.php or .php3 file and ensure there is nothing
+   Edit your config.inc.php or .php file and ensure there is nothing
    (I.E. no blank lines, no spaces, no characters...) neither before the
    <?php tag at the beginning, neither after the ?> tag at the end.
 
@@ -1811,7 +1826,7 @@ FAQ - Frequently Asked Questions
        Assuming you are using PHP 3.0.10 or better, you can specify the
        socket to use when you open the connection. To do this in
        phpMyAdmin, you need to complete the socket information in the
-       config.inc.php3.
+       config.inc.php.
        For example: $cfg['Servers'][$i]['socket'] = '/tmp/mysql.sock';
        Please also make sure that the permissions of this file allow to
        be readable by your webserver (i.e. '0755').
@@ -1916,6 +1931,39 @@ FAQ - Frequently Asked Questions
    parse_url function. The workaround is to create a primary or unique
    key.
 
+    [3.8] I cannot use (clickable) HTML-forms in fields where I put a
+    MIME-Transformation onto!
+
+   Due to a surrounding form-container (for multi-row delete checkboxes),
+   no nested forms can be put inside the table where phpMyAdmin displays
+   the results. You can, however, use any form inside of a table if keep
+   the parent form-container with the target to tbl_row_delete.php and
+   just put your own input-elements inside. If you use a custom submit
+   input field, the form will submit itself to the displaying page again,
+   where you can validate the $HTTP_POST_VARS in a transformation. For a
+   tutorial on how to effectively use transformations, see our Link
+   section on the official phpMyAdmin-homepage.
+
+    [3.9] I get error messages when using "--sql_mode=ANSI" for the MySQL
+    server
+
+   When MySQL is running in ANSI-compatibility mode, there are some major
+   differences in how SQL is structured (see
+   http://www.mysql.com/doc/en/ANSI_mode.html). Most important of all,
+   the quote-character (") is interpreted as an identifier quote
+   character and not as a string quote character, which makes many
+   internal phpMyAdmin operations into invalid SQL statements. There is
+   no workaround to this behaviour. News to this item will be posted in
+   Bug report #816858
+
+    [3.10] Homonyms and no primary key: When the results of a SELECT display
+    more that one column with the same value (for example SELECT lastname from
+    employees where firstname like 'A%' and two "Smith" values are displayed),
+    if I click Edit I cannot be sure that I am editing the intended row.
+
+   Please make sure that your table has a primary key, so that phpMyAdmin
+   can use it for the Edit and Delete links.
+
   [4. ISPs, multi-user installations ]
 
     [4.1] I'm an ISP. Can I setup one central copy of phpMyAdmin or do I need
@@ -1937,12 +1985,12 @@ FAQ - Frequently Asked Questions
    If other people have telnet access to your server, you should use
    phpMyAdmin's HTTP authentication feature.
    Suggestions:
-     * Your config.inc.php3 file should be chmod 660.
+     * Your config.inc.php file should be chmod 660.
      * All your phpMyAdmin files should be chown phpmy.apache, where
        phpmy is a user whose password is only known to you, and apache is
        the group under which Apache runs.
      * You should use PHP safe mode, to protect from other users that try
-       to include your config.inc.php3 in their scripts.
+       to include your config.inc.php in their scripts.
 
     [4.3] I get errors about not being able to include a file in /lang or in
     /libraries.
@@ -2123,7 +2171,9 @@ FAQ - Frequently Asked Questions
 
    Since version 2.2.3, you have a checkbox for each field that can be
    null. Before 2.2.3, you had to enter "null", without the quotes, as
-   the field's value.
+   the field's value. Since version 2.5.5, you have to use the checkbox
+   to get a real NULL value, so if you enter "NULL" this means you want a
+   literal NULL in the field, and not a NULL value (this works in PHP4).
 
     [6.4] How can I backup my database or table?
 
@@ -2418,8 +2468,8 @@ FAQ - Frequently Asked Questions
     existing language, where do I start?
 
    Always use the current CVS version of your language file. For a new
-   language, start from english-iso-8859-1.inc.php3. If you don't know
-   how to get the CVS version, please ask one of the developers.
+   language, start from english-iso-8859-1.inc.php. If you don't know how
+   to get the CVS version, please ask one of the developers.
    Please note that we try not to use HTML entities like &eacute; in the
    translations, since we define the right character set in the file.
    With HTML entities, the text on JavaScript messages would not display
@@ -2491,12 +2541,12 @@ Developers Information
 
    If you're planning to contribute source, please read the following
    information:
-     * All files include header.inc.php3 (layout),
-       libraries/common.lib.php3 (common functions) and config.inc.php3.
-       All configuration data belongs in config.inc.php3. Please keep it
+     * All files include header.inc.php (layout),
+       libraries/common.lib.php (common functions) and config.inc.php.
+       All configuration data belongs in config.inc.php. Please keep it
        free from other code.
        Commonly used functions should be added to
-       libraries/common.lib.php3 and more specific ones may be added
+       libraries/common.lib.php and more specific ones may be added
        within a library stored into the libraries sub-directory.
      * Obviously, you're free to use whatever coding style you want. But
        please try to keep your code as simple as possible: beginners are
@@ -2505,10 +2555,10 @@ Developers Information
        compliant on one hand, they fit the PEAR coding standards on the
        other hand. Please pay attention to this.
      * Please try to keep up the file-naming conventions. Table-related
-       stuff goes to tbl_*.php3, db-related code to db_*.php3,
-       server-related tools to server_*.php3 and so on.
+       stuff goes to tbl_*.php, db-related code to db_*.php,
+       server-related tools to server_*.php and so on.
      * Please don't use verbose strings in your code, instead add the
-       string (at least) to english-iso-8859-1.inc.php3 and print() it
+       string (at least) to english-iso-8859-1.inc.php and print() it
        out.
      * If you want to be really helpful, write an entry for the
        ChangeLog.
diff --git a/browse_foreigners.php3 b/browse_foreigners.php
similarity index 92%
rename from browse_foreigners.php3
rename to browse_foreigners.php
index 963c158a9..addd13d80 100644
--- a/browse_foreigners.php3
+++ b/browse_foreigners.php
@@ -5,25 +5,25 @@
 /**
  * Get the variables sent or posted to this script and displays the header
  */
-require('./libraries/grab_globals.lib.php3');
+require('./libraries/grab_globals.lib.php');
 
 /**
  * Gets a core script and starts output buffering work
  */
 if (!defined('PMA_COMMON_LIB_INCLUDED')) {
-    include('./libraries/common.lib.php3');
+    include('./libraries/common.lib.php');
 }
 
 PMA_checkParameters(array('db', 'table', 'field'));
 
-require('./libraries/ob.lib.php3');
+require('./libraries/ob.lib.php');
 if ($cfg['OBGzip']) {
     $ob_mode = PMA_outBufferModeGet();
     if ($ob_mode) {
         PMA_outBufferPre($ob_mode);
     }
 }
-include('./libraries/header_http.inc.php3');
+include('./libraries/header_http.inc.php');
 $field = urldecode($field);
 
 /**
@@ -40,7 +40,7 @@ PMA_setFontSizes();
     <title>phpMyAdmin</title>
     <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" />
     <base<?php if (!empty($cfg['PmaAbsoluteUri'])) echo ' href="' . $cfg['PmaAbsoluteUri'] . '"'; ?> />
-    <link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php3?lang=<?php echo $lang; ?>&amp;js_frame=right" />
+    <link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php?lang=<?php echo $lang; ?>&amp;js_frame=right" />
     <script src="libraries/functions.js" type="text/javascript" language="javascript"></script>
     <script type="text/javascript" language="javascript">
     self.focus();
@@ -58,8 +58,8 @@ PMA_setFontSizes();
 <body bgcolor="<?php echo $cfg['LeftBgColor']; ?>" style="margin-left: 5px; margin-top: 5px; margin-right: 5px; margin-bottom: 0px">
 <?php
 $per_page = 200;
-require('./libraries/relation.lib.php3'); // foreign keys
-require('./libraries/transformations.lib.php3'); // Transformations
+require('./libraries/relation.lib.php'); // foreign keys
+require('./libraries/transformations.lib.php'); // Transformations
 $cfgRelation = PMA_getRelationsParam();
 $foreigners  = ($cfgRelation['relwork'] ? PMA_getForeigners($db, $table) : FALSE);
 
@@ -74,10 +74,10 @@ if (isset($foreign_navig) && $foreign_navig == $strShowAll) {
     unset($foreign_limit);
 }
 
-include('./libraries/get_foreign.lib.php3');
+include('./libraries/get_foreign.lib.php');
 ?>
 
-<form action="browse_foreigners.php3" method="post">
+<form action="browse_foreigners.php" method="post">
 <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
 <input type="hidden" name="field" value="<?php echo urlencode($field); ?>" />
 
@@ -95,7 +95,7 @@ $nbTotalPage = @ceil($the_total / $session_max_rows);
 
 if ($the_total > $per_page) {
     $gotopage = '<br />' . $GLOBALS['strPageNumber']
-              . '<select name="goToPage" onChange="goToUrl(this, \'browse_foreigners.php3?field=' . urlencode($field) . '&amp;' . PMA_generate_common_url($db, $table) . '&amp;\');">';
+              . '<select name="goToPage" onChange="goToUrl(this, \'browse_foreigners.php?field=' . urlencode($field) . '&amp;' . PMA_generate_common_url($db, $table) . '&amp;\');">';
     if ($nbTotalPage < 200) {
         $firstPage = 1;
         $lastPage  = $nbTotalPage;
diff --git a/chk_rel.php3 b/chk_rel.php
similarity index 53%
rename from chk_rel.php3
rename to chk_rel.php
index c87d3c0a7..5e0058bea 100644
--- a/chk_rel.php3
+++ b/chk_rel.php
@@ -6,10 +6,10 @@
 /**
  * Gets some core libraries
  */
-require('./libraries/grab_globals.lib.php3');
-require('./libraries/common.lib.php3');
-require('./db_details_common.php3');
-require('./libraries/relation.lib.php3');
+require('./libraries/grab_globals.lib.php');
+require('./libraries/common.lib.php');
+require('./db_details_common.php');
+require('./libraries/relation.lib.php');
 
 
 /**
@@ -22,5 +22,5 @@ $cfgRelation = PMA_getRelationsParam(TRUE);
  * Displays the footer
  */
 echo "\n";
-require('./footer.inc.php3');
+require('./footer.inc.php');
 ?>
diff --git a/config.inc.php3 b/config.inc.php
old mode 100755
new mode 100644
similarity index 96%
rename from config.inc.php3
rename to config.inc.php
index 6d3f578e6..b179d18fc
--- a/config.inc.php3
+++ b/config.inc.php
@@ -200,7 +200,7 @@ $cfg['UseDbSearch']             = TRUE;   // whether to enable the "database sea
 $cfg['IgnoreMultiSubmitErrors'] = FALSE;  // if set to true, PMA continues computing multiple-statement queries
                                           // even if one of the queries failed
 $cfg['VerboseMultiSubmit']      = TRUE;   // if set to true, PMA will show the affected rows of EACH statement on
-                                          // multiple-statement queries. See the read_dump.php3 file for hardcoded
+                                          // multiple-statement queries. See the read_dump.php file for hardcoded
                                           // defaults on how many queries a statement may contain!
 $cfg['AllowArbitraryServer']    = FALSE;  // allow login to any user entered server in cookie based auth
 
@@ -268,26 +268,26 @@ $cfg['PropertiesIconic']      = TRUE;   // Use icons instead of text for the tab
 $cfg['PropertiesNumColumns']  = 1;      // How many columns should be used for table display of a database?
                                         // (a value larger than 1 results in some information being hidden)
 
-$cfg['DefaultTabServer']      = 'main.php3';
+$cfg['DefaultTabServer']      = 'main.php';
                                    // Possible values:
-                                   // 'main.php3' = the welcome page
+                                   // 'main.php' = the welcome page
                                    // (recommended for multiuser setups)
-                                   // 'server_databases.php3' = list of databases
-                                   // 'server_status.php3' = runtime information
-                                   // 'server_variables.php3' = MySQL server variables
-                                   // 'server_privileges.php3' = user management
-                                   // 'server_processlist.php3' = process list
-$cfg['DefaultTabDatabase']    = 'db_details_structure.php3';
+                                   // 'server_databases.php' = list of databases
+                                   // 'server_status.php' = runtime information
+                                   // 'server_variables.php' = MySQL server variables
+                                   // 'server_privileges.php' = user management
+                                   // 'server_processlist.php' = process list
+$cfg['DefaultTabDatabase']    = 'db_details_structure.php';
                                    // Possible values:
-                                   // 'db_details_structure.php3' = tables list
-                                   // 'db_details.php3' = sql form
-                                   // 'db_search.php3' = search query
-$cfg['DefaultTabTable']       = 'tbl_properties_structure.php3';
+                                   // 'db_details_structure.php' = tables list
+                                   // 'db_details.php' = sql form
+                                   // 'db_search.php' = search query
+$cfg['DefaultTabTable']       = 'tbl_properties_structure.php';
                                    // Possible values:
-                                   // 'tbl_properties_structure.php3' = fields list
-                                   // 'tbl_properties.php3' = sql form
-                                   // 'tbl_select.php3 = select page
-                                   // 'tbl_change.php3 = insert row page
+                                   // 'tbl_properties_structure.php' = fields list
+                                   // 'tbl_properties.php' = sql form
+                                   // 'tbl_select.php = select page
+                                   // 'tbl_change.php = insert row page
 
 /**
  * Export defaults
@@ -370,7 +370,7 @@ $cfg['PDFDefaultPageSize']  = 'A4';
 $cfg['DefaultLang'] = 'en-iso-8859-1';
 
 // Force: always use this language - must be defined in
-//        libraries/select_lang.lib.php3
+//        libraries/select_lang.lib.php
 // $cfg['Lang']     = 'en-iso-8859-1';
 
 // Default charset to use for recoding of MySQL queries, does not take
@@ -435,7 +435,7 @@ $cfg['AvailableCharsets'] = array(
 );
 
 // Loads language file
-require('./libraries/select_lang.lib.php3');
+require('./libraries/select_lang.lib.php');
 
 
 /**
diff --git a/css/phpmyadmin.css.php3 b/css/phpmyadmin.css.php
similarity index 98%
rename from css/phpmyadmin.css.php3
rename to css/phpmyadmin.css.php
index e51fc726b..02d1e14e5 100644
--- a/css/phpmyadmin.css.php3
+++ b/css/phpmyadmin.css.php
@@ -4,16 +4,16 @@
 
 chdir('..');
 $is_minimum_common = TRUE;
-require('./libraries/grab_globals.lib.php3');
-require('./libraries/common.lib.php3');
+require('./libraries/grab_globals.lib.php');
+require('./libraries/common.lib.php');
 
 // Gets the default font sizes
-// garvin: TODO: Should be optimized to not include the whole common.lib.php3 bunch
+// garvin: TODO: Should be optimized to not include the whole common.lib.php bunch
 // but only functions used to determine browser heritage.
 PMA_setFontSizes();
 
 $ctype = 'css';
-require('./libraries/header_http.inc.php3');
+require('./libraries/header_http.inc.php');
 
 if (!isset($js_frame)) {
     $js_frame = 'left';
diff --git a/db_create.php3 b/db_create.php
old mode 100755
new mode 100644
similarity index 82%
rename from db_create.php3
rename to db_create.php
index c9ec99c89..26de2f08f
--- a/db_create.php3
+++ b/db_create.php
@@ -6,12 +6,12 @@
 /**
  * Gets some core libraries
  */
-require('./libraries/grab_globals.lib.php3');
+require('./libraries/grab_globals.lib.php');
 $js_to_run = 'functions.js';
-require('./header.inc.php3');
+require('./header.inc.php');
 
 if (!defined('PMA_COMMON_LIB_INCLUDED')) {
-    include('./libraries/common.lib.php3');
+    include('./libraries/common.lib.php');
 }
 
 PMA_checkParameters(array('db'));
@@ -19,7 +19,7 @@ PMA_checkParameters(array('db'));
 /**
  * Defines the url to return to in case of error in a sql statement
  */
-$err_url = 'main.php3?' . PMA_generate_common_url();
+$err_url = 'main.php?' . PMA_generate_common_url();
 
 /**
  * Ensures the db name is valid
diff --git a/db_datadict.php3 b/db_datadict.php
similarity index 96%
rename from db_datadict.php3
rename to db_datadict.php
index e02d2ac08..5601a99db 100644
--- a/db_datadict.php3
+++ b/db_datadict.php
@@ -6,16 +6,16 @@
  * Gets the variables sent or posted to this script, then displays headers
  */
 if (!isset($selected_tbl)) {
-    include('./libraries/grab_globals.lib.php3');
-    include('./header.inc.php3');
+    include('./libraries/grab_globals.lib.php');
+    include('./header.inc.php');
 }
 
 
 /**
  * Gets the relations settings
  */
-require('./libraries/relation.lib.php3');
-require('./libraries/transformations.lib.php3');
+require('./libraries/relation.lib.php');
+require('./libraries/transformations.lib.php');
 
 $cfgRelation  = PMA_getRelationsParam();
 
@@ -28,9 +28,9 @@ PMA_checkParameters(array('db'));
  * Defines the url to return to in case of error in a sql statement
  */
 if (isset($table)) {
-    $err_url = 'tbl_properties.php3?' . PMA_generate_common_url($db, $table);
+    $err_url = 'tbl_properties.php?' . PMA_generate_common_url($db, $table);
 } else {
-    $err_url = 'db_details.php3?' . PMA_generate_common_url($db);
+    $err_url = 'db_details.php?' . PMA_generate_common_url($db);
 }
 
 if ($cfgRelation['commwork']) {
@@ -333,5 +333,5 @@ function printPage()
 <?php
 echo '<br /><br />&nbsp;<input type="button" style="visibility: ; width: 100px; height: 25px" name="print" value="' . $strPrint . '" onclick="printPage()">' . "\n";
 
-require('./footer.inc.php3');
+require('./footer.inc.php');
 ?>
diff --git a/db_details.php3 b/db_details.php
old mode 100755
new mode 100644
similarity index 94%
rename from db_details.php3
rename to db_details.php
index c05b006b8..825aed013
--- a/db_details.php3
+++ b/db_details.php
@@ -6,15 +6,15 @@
 /**
  * Runs common work
  */
-require('./db_details_common.php3');
-$url_query .= '&amp;goto=db_details.php3';
+require('./db_details_common.php');
+$url_query .= '&amp;goto=db_details.php';
 
 
 /**
  * Database work
  */
 if (isset($show_query) && $show_query == '1') {
-    // This script has been called by read_dump.php3
+    // This script has been called by read_dump.php
     if (isset($sql_query_cpy)) {
         $query_to_display = $sql_query_cpy;
     }
@@ -29,18 +29,18 @@ if (isset($show_query) && $show_query == '1') {
 
 /**
  * Gets informations about the database and, if it is empty, move to the
- * "db_details_structure.php3" script where table can be created
+ * "db_details_structure.php" script where table can be created
  */
 $sub_part    = '';
-require('./db_details_db_info.php3');
+require('./db_details_db_info.php');
 if ($num_tables == 0 && empty($db_query_force)) {
     $is_info = TRUE;
-    include('./db_details_structure.php3');
+    include('./db_details_structure.php');
     exit();
 }
 
 // loic1: defines wether file upload is available or not
-// (now defined in common.lib.php3)
+// (now defined in common.lib.php)
 
 $auto_sel  = ($cfg['TextareaAutoSelect']
                // 2003-02-05 rabus: This causes big trouble with Opera 7 for
@@ -51,12 +51,12 @@ $auto_sel  = ($cfg['TextareaAutoSelect']
 ?>
 <!-- Query box, sql file loader and bookmark support -->
 <a name="querybox"></a>
-<form method="post" action="read_dump.php3"<?php if ($is_upload) echo ' enctype="multipart/form-data"'; echo "\n"; ?>
+<form method="post" action="read_dump.php"<?php if ($is_upload) echo ' enctype="multipart/form-data"'; echo "\n"; ?>
     onsubmit="return checkSqlQuery(this)">
     <input type="hidden" name="is_js_confirmed" value="0" />
     <?php echo PMA_generate_common_hidden_inputs($db); ?>
     <input type="hidden" name="pos" value="0" />
-    <input type="hidden" name="goto" value="db_details.php3" />
+    <input type="hidden" name="goto" value="db_details.php" />
     <input type="hidden" name="zero_rows" value="<?php echo htmlspecialchars($strSuccess); ?>" />
     <input type="hidden" name="prev_sql_query" value="<?php echo ((!empty($query_to_display)) ? htmlspecialchars($query_to_display) : ''); ?>" />
     <?php echo sprintf($strRunSQLQuery, htmlspecialchars($db)) . ' ' . PMA_showMySQLDocu('Reference', 'SELECT'); ?>&nbsp;:<br />
@@ -195,5 +195,5 @@ if (function_exists('PMA_set_enc_form')) {
  * Displays the footer
  */
 echo "\n";
-require('./footer.inc.php3');
+require('./footer.inc.php');
 ?>
diff --git a/db_details_common.php3 b/db_details_common.php
similarity index 66%
rename from db_details_common.php3
rename to db_details_common.php
index d850e4a04..824a7528e 100644
--- a/db_details_common.php3
+++ b/db_details_common.php
@@ -6,13 +6,13 @@
  * Gets some core libraries
  */
 if (!defined('PMA_GRAB_GLOBALS_INCLUDED')) {
-    include('./libraries/grab_globals.lib.php3');
+    include('./libraries/grab_globals.lib.php');
 }
 if (!defined('PMA_COMMON_LIB_INCLUDED')) {
-    include('./libraries/common.lib.php3');
+    include('./libraries/common.lib.php');
 }
 if (!defined('PMA_BOOKMARK_LIB_INCLUDED')) {
-    include('./libraries/bookmark.lib.php3');
+    include('./libraries/bookmark.lib.php');
 }
 
 PMA_checkParameters(array('db'));
@@ -20,7 +20,7 @@ PMA_checkParameters(array('db'));
 /**
  * Defines the urls to return to in case of error in a sql statement
  */
-$err_url_0 = 'main.php3?' . PMA_generate_common_url();
+$err_url_0 = 'main.php?' . PMA_generate_common_url();
 $err_url   = $cfg['DefaultTabDatabase'] . '?' . PMA_generate_common_url($db);
 
 
@@ -34,21 +34,21 @@ if (!isset($is_db) || !$is_db) {
         $is_db = @PMA_mysql_select_db($db);
     }
     if (empty($db) || !$is_db) {
-        header('Location: ' . $cfg['PmaAbsoluteUri'] . 'main.php3?' . PMA_generate_common_url('', '', '&') . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1');
+        header('Location: ' . $cfg['PmaAbsoluteUri'] . 'main.php?' . PMA_generate_common_url('', '', '&') . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1');
         exit();
     }
 } // end if (ensures db exists)
 // Displays headers
 if (!isset($message)) {
     $js_to_run = 'functions.js';
-    include('./header.inc.php3');
+    include('./header.inc.php');
     // Reloads the navigation frame via JavaScript if required
     if (isset($reload) && $reload) {
         echo "\n";
         ?>
 <script type="text/javascript" language="javascript1.2">
 <!--
-window.parent.frames['nav'].location.replace('./left.php3?<?php echo PMA_generate_common_url($db, '', '&'); ?>&hash=' + <?php echo (($cfg['QueryFrame'] && $cfg['QueryFrameJS']) ? 'window.parent.frames[\'queryframe\'].document.hashform.hash.value' : "'" . md5($cfg['PmaAbsoluteUri']) . "'"); ?>);
+window.parent.frames['nav'].location.replace('./left.php?<?php echo PMA_generate_common_url($db, '', '&'); ?>&hash=' + <?php echo (($cfg['QueryFrame'] && $cfg['QueryFrameJS']) ? 'window.parent.frames[\'queryframe\'].document.hashform.hash.value' : "'" . md5($cfg['PmaAbsoluteUri']) . "'"); ?>);
 //-->
 </script>
         <?php
diff --git a/db_details_db_info.php3 b/db_details_db_info.php
similarity index 97%
rename from db_details_db_info.php3
rename to db_details_db_info.php
index 4c4a27ef9..c9403c60b 100644
--- a/db_details_db_info.php3
+++ b/db_details_db_info.php
@@ -6,7 +6,7 @@
 // Check parameters
 
 if (!defined('PMA_COMMON_LIB_INCLUDED')) {
-    include('./libraries/common.lib.php3');
+    include('./libraries/common.lib.php');
 }
 
 PMA_checkParameters(array('db'));
@@ -79,6 +79,6 @@ else {
  * Displays top menu links
  */
 echo '<!-- Top menu links -->' . "\n";
-require('./db_details_links.php3');
+require('./db_details_links.php');
 
 ?>
diff --git a/db_details_export.php3 b/db_details_export.php
similarity index 82%
rename from db_details_export.php3
rename to db_details_export.php
index 4d4c761f8..38920d024 100644
--- a/db_details_export.php3
+++ b/db_details_export.php
@@ -7,9 +7,9 @@
  * Gets some core libraries
  */
 $sub_part  = '_export';
-require('./db_details_common.php3');
-$url_query .= '&amp;goto=db_details_export.php3';
-require('./db_details_db_info.php3');
+require('./db_details_common.php');
+$url_query .= '&amp;goto=db_details_export.php';
+require('./db_details_db_info.php');
 
 /**
  * Displays the form
@@ -41,9 +41,9 @@ if ($num_tables > 1) {
     $multi_values .= "\n";
     $multi_values .= '</select></div>';
 
-    $checkall_url = 'db_details_export.php3?' 
+    $checkall_url = 'db_details_export.php?' 
                   . PMA_generate_common_url($db)
-                  . '&amp;goto=db_details_export.php3';
+                  . '&amp;goto=db_details_export.php';
     
     $multi_values .= '<br />
             <a href="' . $checkall_url . '&amp;selectall=1" onclick="setSelectOptions(\'dump\', \'table_select[]\', true); return false;">' . $strSelectAll . '</a>
@@ -52,15 +52,15 @@ if ($num_tables > 1) {
             <br /><br />';
 } elseif ($num_tables == 0) {
     echo $strDatabaseNoTable;
-    include('./footer.inc.php3');
+    include('./footer.inc.php');
     exit;
 } // end if
 
 $export_type = 'database';
-require('./libraries/display_export.lib.php3');
+require('./libraries/display_export.lib.php');
 
 /**
  * Displays the footer
  */
-require('./footer.inc.php3');
+require('./footer.inc.php');
 ?>
diff --git a/db_details_importdocsql.php3 b/db_details_importdocsql.php
similarity index 97%
rename from db_details_importdocsql.php3
rename to db_details_importdocsql.php
index 79484d151..6d8ed2922 100644
--- a/db_details_importdocsql.php3
+++ b/db_details_importdocsql.php
@@ -12,13 +12,13 @@
  * Get the values of the variables posted or sent to this script and display
  * the headers
  */
-require('./libraries/read_dump.lib.php3');
-require('./libraries/grab_globals.lib.php3');
-require('./header.inc.php3');
+require('./libraries/read_dump.lib.php');
+require('./libraries/grab_globals.lib.php');
+require('./header.inc.php');
 
 //require common added for string importing - Robbat2, 15 January 2003 9.34PM
 //all hardcoded strings converted by Robbat2, 15 January 2003 9.34PM
-require('./libraries/common.lib.php3');
+require('./libraries/common.lib.php');
 
 // Check parameters
 PMA_checkParameters(array('db'));
@@ -155,7 +155,7 @@ if (isset($cfg['docSQLDir']) && !empty($cfg['docSQLDir'])) {
         }
 
         // Get relation settings
-        include('./libraries/relation.lib.php3');
+        include('./libraries/relation.lib.php');
         $cfgRelation = PMA_getRelationsParam();
 
         // Gets the query from a file if required
@@ -245,7 +245,7 @@ if (isset($cfg['docSQLDir']) && !empty($cfg['docSQLDir'])) {
      */
     ?>
 
-    <form method="post" action="db_details_importdocsql.php3" <?php if ($is_upload) echo ' enctype="multipart/form-data"'; ?>>
+    <form method="post" action="db_details_importdocsql.php" <?php if ($is_upload) echo ' enctype="multipart/form-data"'; ?>>
         <?php echo PMA_generate_common_hidden_inputs($db); ?>
         <input type="hidden" name="submit_show" value="true" />
         <input type="hidden" name="do" value="import" />
@@ -316,6 +316,6 @@ if (isset($cfg['docSQLDir']) && !empty($cfg['docSQLDir'])) {
  * Displays the footer
  */
 echo "\n";
-require('./footer.inc.php3');
+require('./footer.inc.php');
 
 ?>
diff --git a/db_details_links.php3 b/db_details_links.php
similarity index 82%
rename from db_details_links.php3
rename to db_details_links.php
index 4f69213b2..889dab7bf 100644
--- a/db_details_links.php3
+++ b/db_details_links.php
@@ -23,9 +23,9 @@ if (empty($sub_part)) {
  */
 // Export link if there is at least one table
 if ($num_tables > 0) {
-    $lnk3 = 'db_details_export.php3';
+    $lnk3 = 'db_details_export.php';
     $arg3 = $url_query;
-    $lnk4 = 'db_search.php3';
+    $lnk4 = 'db_search.php';
     $arg4 = $url_query;
 }
 else {
@@ -41,12 +41,12 @@ if (!$cfg['AllowUserDropDatabase']) {
     $cfg['AllowUserDropDatabase'] = (!PMA_mysql_error());
 }
 if ($cfg['AllowUserDropDatabase']) {
-    $lnk5 = 'sql.php3';
+    $lnk5 = 'sql.php';
     $arg5 = $url_query . '&amp;sql_query='
           . urlencode('DROP DATABASE ' . PMA_backquote($db))
           . '&amp;zero_rows='
           . urlencode(sprintf($strDatabaseHasBeenDropped, htmlspecialchars(PMA_backquote($db))))
-          . '&amp;goto=main.php3&amp;back=db_details' . $sub_part . '.php3&amp;reload=1&amp;purge=1';
+          . '&amp;goto=main.php&amp;back=db_details' . $sub_part . '.php&amp;reload=1&amp;purge=1';
     $att5 = 'class="drop" '
           . 'onclick="return confirmLink(this, \'DROP DATABASE ' . PMA_jsFormat($db) . '\')"';
 }
@@ -67,11 +67,11 @@ if ($cfg['LightTabs']) {
         <td width="8">&nbsp;</td>';
 }
 
-echo PMA_printTab($strStructure, 'db_details_structure.php3', $url_query);
-echo PMA_printTab($strSQL, 'db_details.php3', $url_query . '&amp;db_query_force=1');
+echo PMA_printTab($strStructure, 'db_details_structure.php', $url_query);
+echo PMA_printTab($strSQL, 'db_details.php', $url_query . '&amp;db_query_force=1');
 echo PMA_printTab($strExport, $lnk3, $arg3);
 echo PMA_printTab($strSearch, $lnk4, $arg4);
-echo PMA_printTab($strQBE, ($num_tables > 0) ? 'db_details_qbe.php3' : '', $url_query);
+echo PMA_printTab($strQBE, ($num_tables > 0) ? 'db_details_qbe.php' : '', $url_query);
 
 // Displays drop link
 if ($lnk5) {
diff --git a/db_details_qbe.php3 b/db_details_qbe.php
old mode 100755
new mode 100644
similarity index 98%
rename from db_details_qbe.php3
rename to db_details_qbe.php
index 6293528a8..2fd942fc7
--- a/db_details_qbe.php3
+++ b/db_details_qbe.php
@@ -7,9 +7,9 @@
  * Get the values of the variables posted or sent to this script and display
  * the headers
  */
-require('./libraries/grab_globals.lib.php3');
-require('./libraries/common.lib.php3');
-require('./libraries/relation.lib.php3');
+require('./libraries/grab_globals.lib.php');
+require('./libraries/common.lib.php');
+require('./libraries/relation.lib.php');
 
 
 /**
@@ -22,16 +22,16 @@ $cfgRelation = PMA_getRelationsParam();
  * A query has been submitted -> execute it, else display the headers
  */
 if (isset($submit_sql) && eregi('^SELECT', $encoded_sql_query)) {
-    $goto      = 'db_details.php3';
+    $goto      = 'db_details.php';
     $zero_rows = htmlspecialchars($strSuccess);
     $sql_query = urldecode($encoded_sql_query);
-    include('./sql.php3');
+    include('./sql.php');
     exit();
 } else {
     $sub_part  = '_qbe';
-    include('./db_details_common.php3');
-    $url_query .= '&amp;goto=db_details_qbe.php3';
-    include('./db_details_db_info.php3');
+    include('./db_details_common.php');
+    $url_query .= '&amp;goto=db_details_qbe.php';
+    include('./db_details_db_info.php');
 }
 
 if (isset($submit_sql) && !eregi('^SELECT', $encoded_sql_query)) {
@@ -170,7 +170,7 @@ $realwidth = $wid . 'ex';
 ?>
 
 <!-- Query by example form -->
-<form action="db_details_qbe.php3" method="post">
+<form action="db_details_qbe.php" method="post">
     <table border="<?php echo $cfg['Border']; ?>">
 
     <!-- Fields row -->
@@ -1098,5 +1098,5 @@ if (!empty($qry_orderby)) {
 /**
  * Displays the footer
  */
-require('./footer.inc.php3');
+require('./footer.inc.php');
 ?>
diff --git a/db_details_structure.php3 b/db_details_structure.php
similarity index 90%
rename from db_details_structure.php3
rename to db_details_structure.php
index bb857cf7d..3580b4dfe 100644
--- a/db_details_structure.php3
+++ b/db_details_structure.php
@@ -9,25 +9,25 @@
  */
 if (empty($is_info)) {
     if (!defined('PMA_GRAB_GLOBALS_INCLUDED')) {
-        include('./libraries/grab_globals.lib.php3');
+        include('./libraries/grab_globals.lib.php');
     }
     if (!defined('PMA_COMMON_LIB_INCLUDED')) {
-        include('./libraries/common.lib.php3');
+        include('./libraries/common.lib.php');
     }
 
     // Drops/deletes/etc. multiple tables if required
     if ((!empty($submit_mult) && isset($selected_tbl))
        || isset($mult_btn)) {
-        $action = 'db_details_structure.php3';
-        $err_url = 'db_details_structure.php3?'. PMA_generate_common_url($db);
-        include('./mult_submits.inc.php3');
+        $action = 'db_details_structure.php';
+        $err_url = 'db_details_structure.php?'. PMA_generate_common_url($db);
+        include('./mult_submits.inc.php');
     }
-    include('./db_details_common.php3');
-    $url_query .= '&amp;goto=db_details_structure.php3';
+    include('./db_details_common.php');
+    $url_query .= '&amp;goto=db_details_structure.php';
 
     // Gets the database structure
     $sub_part = '_structure';
-    include('./db_details_db_info.php3');
+    include('./db_details_db_info.php');
     echo "\n";
 
     /**
@@ -82,7 +82,7 @@ function pma_TableHeader($alternate = FALSE) {
 /**
  * Settings for relations stuff
  */
-require('./libraries/relation.lib.php3');
+require('./libraries/relation.lib.php');
 $cfgRelation = PMA_getRelationsParam();
 
 /**
@@ -190,7 +190,7 @@ else if (PMA_MYSQL_INT_VERSION >= 32303) {
         } // end if
     }
     ?>
-<form method="post" action="db_details_structure.php3" name="tablesForm">
+<form method="post" action="db_details_structure.php" name="tablesForm">
     <?php echo PMA_generate_common_hidden_inputs($db); ?>
 
 <?php
@@ -251,11 +251,11 @@ else if (PMA_MYSQL_INT_VERSION >= 32303) {
                 </td>
                 <td align="center" bgcolor="<?php echo $bgcolor; ?>">
         <?php
-        include('./libraries/bookmark.lib.php3');
+        include('./libraries/bookmark.lib.php');
         $book_sql_query = PMA_queryBookmarks($db, $cfg['Bookmark'], '\'' . PMA_sqlAddslashes($table) . '\'', 'label');
         
         if (!empty($sts_data['Rows'])) {
-            echo '<a href="sql.php3?' . $tbl_url_query . '&amp;sql_query='
+            echo '<a href="sql.php?' . $tbl_url_query . '&amp;sql_query='
                  . (isset($book_sql_query) && $book_sql_query != FALSE ? urlencode($book_sql_query) : urlencode('SELECT * FROM ' . PMA_backquote($table)))
                  . '&amp;pos=0">' . $titles['Browse'] . '</a>';
         } else {
@@ -266,7 +266,7 @@ else if (PMA_MYSQL_INT_VERSION >= 32303) {
                 <td bgcolor="<?php echo $bgcolor; ?>">
         <?php
         if (!empty($sts_data['Rows'])) {
-            echo '<a href="tbl_select.php3?' . $tbl_url_query . '">'
+            echo '<a href="tbl_select.php?' . $tbl_url_query . '">'
                  . $titles['Search'] . '</a>';
         } else {
             echo $titles['NoSearch'];
@@ -274,22 +274,22 @@ else if (PMA_MYSQL_INT_VERSION >= 32303) {
         ?>
                 </td>
                 <td align="center" bgcolor="<?php echo $bgcolor; ?>">
-        <a href="tbl_change.php3?<?php echo $tbl_url_query; ?>">
+        <a href="tbl_change.php?<?php echo $tbl_url_query; ?>">
             <?php echo $titles['Insert']; ?></a>
                 </td>
                 <td align="center" bgcolor="<?php echo $bgcolor; ?>">
-        <a href="tbl_properties_structure.php3?<?php echo $tbl_url_query; ?>">
+        <a href="tbl_properties_structure.php?<?php echo $tbl_url_query; ?>">
             <?php echo $titles['Properties']; ?></a>
                 </td>
                 <td align="center" bgcolor="<?php echo $bgcolor; ?>">
-        <a href="sql.php3?<?php echo $tbl_url_query; ?>&amp;reload=1&amp;purge=1&amp;sql_query=<?php echo urlencode('DROP TABLE ' . PMA_backquote($table)); ?>&amp;zero_rows=<?php echo urlencode(sprintf($strTableHasBeenDropped, htmlspecialchars($table))); ?>"
+        <a href="sql.php?<?php echo $tbl_url_query; ?>&amp;reload=1&amp;purge=1&amp;sql_query=<?php echo urlencode('DROP TABLE ' . PMA_backquote($table)); ?>&amp;zero_rows=<?php echo urlencode(sprintf($strTableHasBeenDropped, htmlspecialchars($table))); ?>"
             onclick="return confirmLink(this, 'DROP TABLE <?php echo PMA_jsFormat($table); ?>')">
             <?php echo $titles['Drop']; ?></a>
                 </td>
                 <td align="center" bgcolor="<?php echo $bgcolor; ?>">
         <?php
         if (!empty($sts_data['Rows'])) {
-            echo '<a href="sql.php3?' . $tbl_url_query
+            echo '<a href="sql.php?' . $tbl_url_query
                  . '&amp;sql_query=';
             if (PMA_MYSQL_INT_VERSION >= 40000) {
                 echo urlencode('TRUNCATE ' . PMA_backquote($table))
@@ -394,13 +394,13 @@ else if (PMA_MYSQL_INT_VERSION >= 32303) {
                 ?>
                 <td align="right" bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap">
                     &nbsp;&nbsp;
-                    <a href="tbl_properties_structure.php3?<?php echo $tbl_url_query; ?>#showusage"><?php echo $formated_size . ' ' . $unit; ?></a>
+                    <a href="tbl_properties_structure.php?<?php echo $tbl_url_query; ?>#showusage"><?php echo $formated_size . ' ' . $unit; ?></a>
                 </td>
                 <td align="right" bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap">
                     &nbsp;&nbsp;
                     <?php 
                     if (isset($formated_overhead)) {
-                        echo '<a href="tbl_properties_structure.php3?' . $tbl_url_query . '#showusage">' . $formated_overhead . ' ' . $overhead_unit . '</a>' . "\n";
+                        echo '<a href="tbl_properties_structure.php?' . $tbl_url_query . '#showusage">' . $formated_overhead . ' ' . $overhead_unit . '</a>' . "\n";
                         unset($formated_overhead);
                         $overhead_check .= "document.getElementById('checkbox_tbl_$i').checked = true;";
                     } else {
@@ -469,7 +469,7 @@ else if (PMA_MYSQL_INT_VERSION >= 32303) {
 
     <?php
     // Check all tables url
-    $checkall_url = 'db_details_structure.php3?' . PMA_generate_common_url($db);
+    $checkall_url = 'db_details_structure.php?' . PMA_generate_common_url($db);
     echo "\n";
     ?>
             <tr>
@@ -553,7 +553,7 @@ else {
     $i = 0;
     echo "\n";
     ?>
-<form action="db_details_structure.php3">
+<form action="db_details_structure.php">
     <?php PMA_generate_common_hidden_inputs($db); ?>
 
 <?php
@@ -601,22 +601,22 @@ else {
                     <b>&nbsp;<label for="checkbox_tbl_<?php echo $i; ?>"><?php echo $table_name; ?></label>&nbsp;</b>
                 </td>
                 <td bgcolor="<?php echo $bgcolor; ?>">
-                    <a href="sql.php3?<?php echo $tbl_url_query; ?>&amp;sql_query=<?php echo urlencode('SELECT * FROM ' . PMA_backquote($table)); ?>&amp;pos=0"><?php echo $strBrowse; ?></a>
+                    <a href="sql.php?<?php echo $tbl_url_query; ?>&amp;sql_query=<?php echo urlencode('SELECT * FROM ' . PMA_backquote($table)); ?>&amp;pos=0"><?php echo $strBrowse; ?></a>
                 </td>
                 <td align="center" bgcolor="<?php echo $bgcolor; ?>">
-                    <a href="tbl_select.php3?<?php echo $tbl_url_query; ?>"><?php echo $titles['Search']; ?></a>
+                    <a href="tbl_select.php?<?php echo $tbl_url_query; ?>"><?php echo $titles['Search']; ?></a>
                 </td>
                 <td bgcolor="<?php echo $bgcolor; ?>">
-                    <a href="tbl_change.php3?<?php echo $tbl_url_query; ?>"><?php echo $titles['Insert']; ?></a>
+                    <a href="tbl_change.php?<?php echo $tbl_url_query; ?>"><?php echo $titles['Insert']; ?></a>
                 </td>
                 <td bgcolor="<?php echo $bgcolor; ?>">
-                    <a href="tbl_properties.php3?<?php echo $tbl_url_query; ?>"><?php echo $titles['Properties']; ?></a>
+                    <a href="tbl_properties.php?<?php echo $tbl_url_query; ?>"><?php echo $titles['Properties']; ?></a>
                 </td>
                 <td bgcolor="<?php echo $bgcolor; ?>">
-                    <a href="sql.php3?<?php echo $tbl_url_query; ?>&amp;reload=1&amp;purge=1&amp;sql_query=<?php echo urlencode('DROP TABLE ' . PMA_backquote($table)); ?>&amp;zero_rows=<?php echo urlencode(sprintf($strTableHasBeenDropped, $table_name)); ?>"><?php echo $titles['Drop']; ?></a>
+                    <a href="sql.php?<?php echo $tbl_url_query; ?>&amp;reload=1&amp;purge=1&amp;sql_query=<?php echo urlencode('DROP TABLE ' . PMA_backquote($table)); ?>&amp;zero_rows=<?php echo urlencode(sprintf($strTableHasBeenDropped, $table_name)); ?>"><?php echo $titles['Drop']; ?></a>
                 </td>
                 <td bgcolor="<?php echo $bgcolor; ?>">
-                    <a href="sql.php3?<?php echo $tbl_url_query; ?>&amp;sql_query=<?php echo urlencode('DELETE FROM ' . PMA_backquote($table)); ?>&amp;zero_rows=<?php echo urlencode(sprintf($strTableHasBeenEmptied, $table_name)); ?>"><?php echo $titles['Empty']; ?></a>
+                    <a href="sql.php?<?php echo $tbl_url_query; ?>&amp;sql_query=<?php echo urlencode('DELETE FROM ' . PMA_backquote($table)); ?>&amp;zero_rows=<?php echo urlencode(sprintf($strTableHasBeenEmptied, $table_name)); ?>"><?php echo $titles['Empty']; ?></a>
                 </td>
                 <td align="right" bgcolor="<?php echo $bgcolor; ?>">
                     <?php PMA_countRecords($db, $table); echo "\n"; ?>
@@ -628,7 +628,7 @@ else {
     echo "\n";
 
     // Check all tables url
-    $checkall_url = 'db_details_structure.php3?' . PMA_generate_common_url($db);
+    $checkall_url = 'db_details_structure.php?' . PMA_generate_common_url($db);
     ?>
             <tr>
                 <td colspan="9">
@@ -682,10 +682,10 @@ if ($num_tables > 0) {
     ?>
     <!-- Printable view of a table -->
     <li>
-        <div style="margin-bottom: 10px"><a href="db_printview.php3?<?php echo $url_query; ?>"><?php echo $strPrintView; ?></a></div>
+        <div style="margin-bottom: 10px"><a href="db_printview.php?<?php echo $url_query; ?>"><?php echo $strPrintView; ?></a></div>
     </li>
     <li>
-         <div style="margin-bottom: 10px"><a href="./db_datadict.php3?<?php echo $url_query; ?>"><?php echo $strDataDict; ?></a></div>
+         <div style="margin-bottom: 10px"><a href="./db_datadict.php?<?php echo $url_query; ?>"><?php echo $strDataDict; ?></a></div>
     </li>
     <?php
 } // end if
@@ -696,7 +696,7 @@ if ($cfgRelation['commwork']) {
 ?>
     <!-- Alter/Enter db-comment -->
     <li>
-        <form method="post" action="db_details_structure.php3">
+        <form method="post" action="db_details_structure.php">
             <?php echo $strDBComment; ?>
             <input type="hidden" name="db_comment" value="true" />
             <?php echo PMA_generate_common_hidden_inputs($db); ?>
@@ -710,7 +710,7 @@ if ($cfgRelation['commwork']) {
 
     <!-- Create a new table -->
     <li>
-        <form method="post" action="tbl_create.php3"
+        <form method="post" action="tbl_create.php"
             onsubmit="return (emptyFormElements(this, 'table') && checkFormElementInRange(this, 'num_fields', 1))">
         <?php echo PMA_generate_common_hidden_inputs($db); ?>
 <?php
@@ -731,7 +731,7 @@ if ($num_tables > 0
     echo '    <li>' . "\n";
     echo '        <div style="margin-bottom: 10px">' . "\n";
     echo '        <font color="red">' . $strError . '</font><br />' . "\n";
-    $url_to_goto = '<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php3?' . $url_query . '">';
+    $url_to_goto = '<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $url_query . '">';
     echo '        ' . sprintf($strRelationNotWorking, $url_to_goto, '</a>') . "\n";
     echo '        </div>' . "\n";
     echo '    </li>' . "\n";
@@ -746,7 +746,7 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) {
     ?>
     <!-- Work on PDF Pages -->
     <li>
-        <div style="margin-bottom: 10px"><a href="pdf_pages.php3?<?php echo $takeaway; ?>"><?php echo $strEditPDFPages; ?></a></div>
+        <div style="margin-bottom: 10px"><a href="pdf_pages.php?<?php echo $takeaway; ?>"><?php echo $strEditPDFPages; ?></a></div>
     </li>
 
     <!-- PDF schema -->
@@ -760,7 +760,7 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) {
         echo "\n";
         ?>
     <li>
-        <form method="post" action="pdf_schema.php3">
+        <form method="post" action="pdf_schema.php">
             <?php echo PMA_generate_common_hidden_inputs($db); ?>
             <?php echo $strDisplayPDF; ?>&nbsp;:<br />
             <?php echo $strPageNumber; ?>&nbsp;
@@ -814,7 +814,7 @@ if ($num_tables > 0
     ?>
     <!-- import docSQL files -->
     <li>
-        <div style="margin-bottom: 10px"><a href="db_details_importdocsql.php3?<?php echo $takeaway . '">' . $strImportDocSQL; ?></a></div>
+        <div style="margin-bottom: 10px"><a href="db_details_importdocsql.php?<?php echo $takeaway . '">' . $strImportDocSQL; ?></a></div>
     </li>
     <?php
 }
@@ -825,5 +825,5 @@ echo "\n" . '</ul>';
  * Displays the footer
  */
 echo "\n";
-require('./footer.inc.php3');
+require('./footer.inc.php');
 ?>
diff --git a/db_printview.php3 b/db_printview.php
old mode 100755
new mode 100644
similarity index 97%
rename from db_printview.php3
rename to db_printview.php
index 8acca9c3c..7bea47214
--- a/db_printview.php3
+++ b/db_printview.php
@@ -6,13 +6,13 @@
 /**
  * Gets the variables sent or posted to this script, then displays headers
  */
-require('./libraries/grab_globals.lib.php3');
-require('./header.inc.php3');
+require('./libraries/grab_globals.lib.php');
+require('./header.inc.php');
 
 // Check parameters
 
 if (!defined('PMA_COMMON_LIB_INCLUDED')) {
-    include('./libraries/common.lib.php3');
+    include('./libraries/common.lib.php');
 }
 
 PMA_checkParameters(array('db'));
@@ -20,12 +20,12 @@ PMA_checkParameters(array('db'));
 /**
  * Defines the url to return to in case of error in a sql statement
  */
-$err_url = 'db_details.php3?' . PMA_generate_common_url($db);
+$err_url = 'db_details.php?' . PMA_generate_common_url($db);
 
 /**
  * Settings for relations stuff
  */
-require('./libraries/relation.lib.php3');
+require('./libraries/relation.lib.php');
 $cfgRelation = PMA_getRelationsParam();
 
 /**
@@ -353,5 +353,5 @@ function printPage()
 <?php
 echo '<br /><br />&nbsp;<input type="button" style="visibility: ; width: 100px; height: 25px" name="print" value="' . $strPrint . '" onclick="printPage()">' . "\n";
 
-require('./footer.inc.php3');
+require('./footer.inc.php');
 ?>
diff --git a/db_search.php3 b/db_search.php
similarity index 93%
rename from db_search.php3
rename to db_search.php
index 3e96cbcc4..4dfc43937 100644
--- a/db_search.php3
+++ b/db_search.php
@@ -9,12 +9,12 @@
 /**
  * Gets some core libraries and send headers
  */
-require('./db_details_common.php3');
+require('./db_details_common.php');
 // If config variable $cfg['Usedbsearch'] is on FALSE : exit.
 if (!$cfg['UseDbSearch']) {
     PMA_mysqlDie($strAccessDenied, '', FALSE, $err_url);
 } // end if
-$url_query .= '&amp;goto=db_search.php3';
+$url_query .= '&amp;goto=db_search.php';
 
 
 /**
@@ -34,7 +34,7 @@ if ($num_tables) {
  * Displays top links
  */
 $sub_part = '';
-require('./db_details_links.php3');
+require('./db_details_links.php');
 
 
 /**
@@ -173,7 +173,7 @@ if (isset($submit_search)) {
 
         <?php
         $url_sql_query = PMA_generate_common_url($db)
-                   . '&amp;goto=db_details.php3'
+                   . '&amp;goto=db_details.php'
                    . '&amp;pos=0'
                    . '&amp;is_js_confirmed=0';
 
@@ -202,11 +202,11 @@ if (isset($submit_search)) {
                  . '    <table><tr><td>' . sprintf($strNumSearchResultsInTable, $res_cnt, htmlspecialchars($onetable)) . "</td>\n";
 
             if ($res_cnt > 0) {
-                   echo '<td>' . PMA_linkOrButton('sql.php3?' . $url_sql_query
+                   echo '<td>' . PMA_linkOrButton('sql.php?' . $url_sql_query
                     . '&amp;sql_query=' .urlencode($newsearchsqls['select_fields']),
                     $strBrowse, '') .  "</td>\n";
 
-                   echo '<td>' . PMA_linkOrButton('sql.php3?' . $url_sql_query
+                   echo '<td>' . PMA_linkOrButton('sql.php?' . $url_sql_query
                     . '&amp;sql_query=' .urlencode($newsearchsqls['delete']),
                     $strDelete, $newsearchsqls['delete']) .  "</td>\n";
 
@@ -241,11 +241,11 @@ if (isset($submit_search)) {
                      . '            <table><tr><td>' . sprintf($strNumSearchResultsInTable, $res_cnt, htmlspecialchars($table_select[$i])) . "</td>\n";
 
                 if ($res_cnt > 0) {
-                   echo '<td>' . PMA_linkOrButton('sql.php3?' . $url_sql_query
+                   echo '<td>' . PMA_linkOrButton('sql.php?' . $url_sql_query
                     . '&amp;sql_query=' .urlencode($newsearchsqls['select_fields']),
                     $strBrowse, '') .  "</td>\n";
 
-                   echo '<td>' . PMA_linkOrButton('sql.php3?' . $url_sql_query
+                   echo '<td>' . PMA_linkOrButton('sql.php?' . $url_sql_query
                     . '&amp;sql_query=' .urlencode($newsearchsqls['delete']),
                     $strDelete, $newsearchsqls['delete']) .  "</td>\n";
 
@@ -284,7 +284,7 @@ if (empty($search_option)) {
 </p>
 
 <a name="db_search"></a>
-<form method="post" action="db_search.php3" name="db_search">
+<form method="post" action="db_search.php" name="db_search">
     <?php echo PMA_generate_common_hidden_inputs($db); ?>
 
     <table>
@@ -348,9 +348,9 @@ if ($num_tables > 1) {
     echo '            </select>' . "\n";
     ?>
             <br />
-            <a href="db_search.php3?<?php echo $url_query; ?>&amp;selectall=1#db_search" onclick="setSelectOptions('db_search', 'table_select[]', true); return false;"><?php echo $strSelectAll; ?></a>
+            <a href="db_search.php?<?php echo $url_query; ?>&amp;selectall=1#db_search" onclick="setSelectOptions('db_search', 'table_select[]', true); return false;"><?php echo $strSelectAll; ?></a>
             &nbsp;/&nbsp;
-            <a href="db_search.php3?<?php echo $url_query; ?>&amp;unselectall=1#db_search" onclick="setSelectOptions('db_search', 'table_select[]', false); return false;"><?php echo $strUnselectAll; ?></a>
+            <a href="db_search.php?<?php echo $url_query; ?>&amp;unselectall=1#db_search" onclick="setSelectOptions('db_search', 'table_select[]', false); return false;"><?php echo $strUnselectAll; ?></a>
     <?php
 }
 else {
@@ -379,5 +379,5 @@ echo"\n";
  * Displays the footer
  */
 echo "\n";
-require('./footer.inc.php3');
+require('./footer.inc.php');
 ?>
diff --git a/export.php3 b/export.php
old mode 100755
new mode 100644
similarity index 91%
rename from export.php3
rename to export.php
index 8fb436a63..9d947c617
--- a/export.php3
+++ b/export.php
@@ -5,9 +5,9 @@
 /**
  * Get the variables sent or posted to this script and a core script
  */
-require('./libraries/grab_globals.lib.php3');
-require('./libraries/common.lib.php3');
-require('./libraries/zip.lib.php3');
+require('./libraries/grab_globals.lib.php');
+require('./libraries/common.lib.php');
+require('./libraries/zip.lib.php');
 
 PMA_checkParameters(array('what'));
 
@@ -21,15 +21,15 @@ if ($what == 'excel') {
 /**
  * Defines the url to return to in case of error in a sql statement
  */
-require('./libraries/export/' . $type . '.php3');
+require('./libraries/export/' . $type . '.php');
 
 // Generate error url
 if ($export_type == 'server') {
-    $err_url = 'server_export.php3?' . PMA_generate_common_url();
+    $err_url = 'server_export.php?' . PMA_generate_common_url();
 } elseif ($export_type == 'database') {
-    $err_url = 'db_details_export.php3?' . PMA_generate_common_url($db);
+    $err_url = 'db_details_export.php?' . PMA_generate_common_url($db);
 } else {
-    $err_url = 'tbl_properties_export.php3?' . PMA_generate_common_url($db, $table);
+    $err_url = 'tbl_properties_export.php?' . PMA_generate_common_url($db, $table);
 }
 
 /**
@@ -263,16 +263,16 @@ if ($save_on_server) {
     }
     if (isset($message)) {
         $js_to_run = 'functions.js';
-        include('./header.inc.php3');
+        include('./header.inc.php');
         if ($export_type == 'server') {
-            $active_page = 'server_export.php3';
-            include('./server_export.php3');
+            $active_page = 'server_export.php';
+            include('./server_export.php');
         } elseif ($export_type == 'database') {
-            $active_page = 'db_details_export.php3';
-            include('./db_details_export.php3');
+            $active_page = 'db_details_export.php';
+            include('./db_details_export.php');
         } else {
-            $active_page = 'tbl_properties_export.php3';
-            include('./tbl_properties_export.php3');
+            $active_page = 'tbl_properties_export.php';
+            include('./tbl_properties_export.php');
         }
         exit();
     }
@@ -299,7 +299,7 @@ if (!$save_on_server) {
     } else {
         // HTML
         $backup_cfgServer = $cfg['Server'];
-        include('./header.inc.php3');
+        include('./header.inc.php');
         $cfg['Server'] = $backup_cfgServer;
         unset($backup_cfgServer);
         echo '<div align="' . $cell_align_left . '">' . "\n";
@@ -314,16 +314,16 @@ if ($export_type == 'database') {
     if ($num_tables == 0) {
         $message = $strNoTablesFound;
         $js_to_run = 'functions.js';
-        include('./header.inc.php3');
+        include('./header.inc.php');
         if ($export_type == 'server') {
-            $active_page = 'server_export.php3';
-            include('./server_export.php3');
+            $active_page = 'server_export.php';
+            include('./server_export.php');
         } elseif ($export_type == 'database') {
-            $active_page = 'db_details_export.php3';
-            include('./db_details_export.php3');
+            $active_page = 'db_details_export.php';
+            include('./db_details_export.php');
         } else {
-            $active_page = 'tbl_properties_export.php3';
-            include('./tbl_properties_export.php3');
+            $active_page = 'tbl_properties_export.php';
+            include('./tbl_properties_export.php');
         }
         exit();
     }
@@ -337,11 +337,11 @@ $do_relation = isset($GLOBALS[$what . '_relation']);
 $do_comments = isset($GLOBALS[$what . '_comments']);
 $do_mime     = isset($GLOBALS[$what . '_mime']);
 if ($do_relation || $do_comments || $do_mime) {
-    require('./libraries/relation.lib.php3');
+    require('./libraries/relation.lib.php');
     $cfgRelation = PMA_getRelationsParam();
 }
 if ($do_mime) {
-    require('./libraries/transformations.lib.php3');
+    require('./libraries/transformations.lib.php');
 }
 
 // Include dates in export?
@@ -457,9 +457,9 @@ if (!empty($asfile)) {
             $dump_buffer = bzcompress($dump_buffer);
             // nijel: eval in next line is because otherwise === causes syntax error on php3
             if (eval('return($dump_buffer === -8);')) {
-                include('./header.inc.php3');
+                include('./header.inc.php');
                 echo sprintf($strBzError, '<a href="http://bugs.php.net/bug.php?id=17300" target="_blank">17300</a>');
-                include('./footer.inc.php3');
+                include('./footer.inc.php');
                 exit;
             }
         }
@@ -483,16 +483,16 @@ if (!empty($asfile)) {
         }
 
         $js_to_run = 'functions.js';
-        include('./header.inc.php3');
+        include('./header.inc.php');
         if ($export_type == 'server') {
-            $active_page = 'server_export.php3';
-            include('./server_export.php3');
+            $active_page = 'server_export.php';
+            include('./server_export.php');
         } elseif ($export_type == 'database') {
-            $active_page = 'db_details_export.php3';
-            include('./db_details_export.php3');
+            $active_page = 'db_details_export.php';
+            include('./db_details_export.php');
         } else {
-            $active_page = 'tbl_properties_export.php3';
-            include('./tbl_properties_export.php3');
+            $active_page = 'tbl_properties_export.php';
+            include('./tbl_properties_export.php');
         }
         exit();
     } else {
@@ -509,6 +509,6 @@ else {
     echo '    </pre>' . "\n";
     echo '</div>' . "\n";
     echo "\n";
-    include('./footer.inc.php3');
+    include('./footer.inc.php');
 } // end if
 ?>
diff --git a/footer.inc.php3 b/footer.inc.php
old mode 100755
new mode 100644
similarity index 94%
rename from footer.inc.php3
rename to footer.inc.php
index 12e4f9c2f..701dc03f3
--- a/footer.inc.php3
+++ b/footer.inc.php
@@ -5,7 +5,7 @@
 // In this file you may add PHP or HTML statements that will be used to define
 // the footer for phpMyAdmin pages.
 
-require('./libraries/relation.lib.php3'); // for PMA_setHistory()
+require('./libraries/relation.lib.php'); // for PMA_setHistory()
 
 /**
  * Query window
@@ -84,7 +84,7 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
 
             return false;
         } else if (parent.frames.queryframe) {
-            new_win_url = 'querywindow.php3?sql_query=' + sql_query + '&<?php echo PMA_generate_common_url(isset($db) ? addslashes($db) : '', isset($table) ? addslashes($table) : '', '&'); ?>';
+            new_win_url = 'querywindow.php?sql_query=' + sql_query + '&<?php echo PMA_generate_common_url(isset($db) ? addslashes($db) : '', isset($table) ? addslashes($table) : '', '&'); ?>';
             parent.frames.queryframe.querywindow=window.open(new_win_url, '','toolbar=0,location=1,directories=0,status=1,menubar=0,scrollbars=yes,resizable=yes,width=<?php echo $cfg['QueryWindowWidth']; ?>,height=<?php echo $cfg['QueryWindowHeight']; ?>');
 
             if (!parent.frames.queryframe.querywindow.opener) {
@@ -137,10 +137,10 @@ if (isset($GLOBALS['cfg']['DBG']['enable'])
         && isset($GLOBALS['cfg']['DBG']['profile']['enable'])
         && $GLOBALS['cfg']['DBG']['profile']['enable']) {
     //run the basic setup code first
-    include('./libraries/dbg/setup.php3');
+    include('./libraries/dbg/setup.php');
     //if the setup ran fine, then do the profiling
     if (isset($GLOBALS['DBG']) && $GLOBALS['DBG']) {
-        include('./libraries/dbg/profiling.php3');
+        include('./libraries/dbg/profiling.php');
         dbg_dump_profiling_results();
     }
 }
diff --git a/header.inc.php3 b/header.inc.php
old mode 100755
new mode 100644
similarity index 96%
rename from header.inc.php3
rename to header.inc.php
index 459e41c48..fb9961389
--- a/header.inc.php3
+++ b/header.inc.php
@@ -9,10 +9,10 @@ if (!defined('PMA_HEADER_INC_INCLUDED')) {
      * Gets a core script and starts output buffering work
      */
     if (!defined('PMA_COMMON_LIB_INCLUDED')) {
-        include('./libraries/common.lib.php3');
+        include('./libraries/common.lib.php');
     }
     if (!defined('PMA_OB_LIB_INCLUDED')) {
-        include('./libraries/ob.lib.php3');
+        include('./libraries/ob.lib.php');
     }
     if ($GLOBALS['cfg']['OBGzip']) {
         $GLOBALS['ob_mode'] = PMA_outBufferModeGet();
@@ -22,11 +22,11 @@ if (!defined('PMA_HEADER_INC_INCLUDED')) {
     }
 
     // garvin: For re-usability, moved http-headers and stylesheets
-    // to a seperate file. It can now be included by header.inc.php3,
-    // queryframe.php3, querywindow.php3.
+    // to a seperate file. It can now be included by header.inc.php,
+    // queryframe.php, querywindow.php.
 
-    include('./libraries/header_http.inc.php3');
-    include('./libraries/header_meta_style.inc.php3');
+    include('./libraries/header_http.inc.php');
+    include('./libraries/header_meta_style.inc.php');
 
     $title     = '';
     if (isset($GLOBALS['db'])) {
diff --git a/header_printview.inc.php3 b/header_printview.inc.php
similarity index 87%
rename from header_printview.inc.php3
rename to header_printview.inc.php
index 197c30eb0..044afb05e 100644
--- a/header_printview.inc.php3
+++ b/header_printview.inc.php
@@ -5,8 +5,8 @@
 /**
  * Gets a core script and starts output buffering work
  */
-require('./libraries/common.lib.php3');
-require('./libraries/ob.lib.php3');
+require('./libraries/common.lib.php');
+require('./libraries/ob.lib.php');
 if ($cfg['OBGzip']) {
     $ob_mode = PMA_outBufferModeGet();
     if ($ob_mode) {
@@ -20,10 +20,10 @@ PMA_checkParameters(array('db', 'full_sql_query'));
 
 
 // garvin: For re-usability, moved http-headers
-// to a seperate file. It can now be included by header.inc.php3,
-// queryframe.php3, querywindow.php3.
+// to a seperate file. It can now be included by header.inc.php,
+// queryframe.php, querywindow.php.
 
-include('./libraries/header_http.inc.php3');
+include('./libraries/header_http.inc.php');
 
 /**
  * Sends the beginning of the html page then returns to the calling script
@@ -46,7 +46,7 @@ if ($text_dir == 'ltr') {
 <head>
 <title><?php echo $strSQLResult; ?> - phpMyAdmin <?php echo PMA_VERSION ?></title>
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" />
-<link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php3?lang=<?php echo $lang; ?>&amp;js_frame=print" />
+<link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php?lang=<?php echo $lang; ?>&amp;js_frame=print" />
 </style>
 </head>
 
diff --git a/index.php3 b/index.php
old mode 100755
new mode 100644
similarity index 83%
rename from index.php3
rename to index.php
index 42923f30b..a2e626e2e
--- a/index.php3
+++ b/index.php
@@ -6,8 +6,8 @@
 /**
  * Gets core libraries and defines some variables
  */
-require('./libraries/grab_globals.lib.php3');
-require('./libraries/common.lib.php3');
+require('./libraries/grab_globals.lib.php');
+require('./libraries/common.lib.php');
 
 // Gets the default font sizes
 PMA_setFontSizes();
@@ -44,7 +44,7 @@ $url_query = PMA_generate_common_url(isset($db) ? $db : '');
 
 header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
 
-require('./libraries/relation.lib.php3');
+require('./libraries/relation.lib.php');
 $cfgRelation = PMA_getRelationsParam();
 
 if ($cfg['QueryHistoryDB'] && $cfgRelation['historywork']) {
@@ -60,7 +60,7 @@ $phpmain_hash_js = time();
 <head>
 <title>phpMyAdmin <?php echo PMA_VERSION; ?> - <?php echo $HTTP_HOST; ?></title>
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" />
-<link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php3?lang=<?php echo $lang; ?>&amp;js_frame=right" />
+<link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php?lang=<?php echo $lang; ?>&amp;js_frame=right" />
 </head>
 
 <?php
@@ -71,8 +71,8 @@ if ($cfg['QueryFrame']) {
         echo '<!--' . "\n";
         echo '    document.writeln(\'<frameset cols="' . $cfg['LeftWidth'] . ',*" rows="*" border="1" frameborder="1" framespacing="0">\');' . "\n";
         echo '    document.writeln(\'    <frameset rows="*, 50" framespacing="0" frameborder="0" border="0">\');' . "\n";
-        echo '    document.writeln(\'        <frame src="left.php3?' . $url_query . '&amp;hash=' . $phpmain_hash . $phpmain_hash_js . '" name="nav" frameborder="0" />\');' . "\n";
-        echo '    document.writeln(\'        <frame src="queryframe.php3?' . $url_query . '&amp;hash=' . $phpmain_hash . $phpmain_hash_js . '" name="queryframe" frameborder="0" scrolling="no" />\');' . "\n";
+        echo '    document.writeln(\'        <frame src="left.php?' . $url_query . '&amp;hash=' . $phpmain_hash . $phpmain_hash_js . '" name="nav" frameborder="0" />\');' . "\n";
+        echo '    document.writeln(\'        <frame src="queryframe.php?' . $url_query . '&amp;hash=' . $phpmain_hash . $phpmain_hash_js . '" name="queryframe" frameborder="0" scrolling="no" />\');' . "\n";
         echo '    document.writeln(\'    </frameset>\');' . "\n";
         echo '    document.writeln(\'    <frame src="' . (empty($db) ? $cfg['DefaultTabServer']  : $cfg['DefaultTabDatabase']) . '?' . $url_query . '" name="phpmain' . $phpmain_hash . $phpmain_hash_js . '" border="0" frameborder="0" />\');' . "\n";
         echo '    document.writeln(\'    <noframes>\');' . "\n";
@@ -89,15 +89,15 @@ if ($cfg['QueryFrame']) {
 
     echo '<frameset cols="' . $cfg['LeftWidth'] . ',*" rows="*"  border="1" frameborder="1" framespacing="0">' . "\n";
     echo '    <frameset rows="*, 50" framespacing="0" frameborder="0" border="0">' . "\n";
-    echo '        <frame src="left.php3?' . $url_query . '&amp;hash=' . $phpmain_hash . '" name="nav" frameborder="0" />' . "\n";
-    echo '        <frame src="queryframe.php3?' . $url_query . '&amp;hash=' . $phpmain_hash . '" name="queryframe" frameborder="0" scrolling="no" />' . "\n";
+    echo '        <frame src="left.php?' . $url_query . '&amp;hash=' . $phpmain_hash . '" name="nav" frameborder="0" />' . "\n";
+    echo '        <frame src="queryframe.php?' . $url_query . '&amp;hash=' . $phpmain_hash . '" name="queryframe" frameborder="0" scrolling="no" />' . "\n";
     echo '    </frameset>' . "\n";
     echo '    <frame src="' . (empty($db) ? $cfg['DefaultTabServer']  : $cfg['DefaultTabDatabase']) . '?' . $url_query . '" name="phpmain' . $phpmain_hash . '" frameborder="0" />' . "\n";
 
 } else {
 
     echo '<frameset cols="' . $cfg['LeftWidth'] . ',*" rows="*" border="1" frameborder="1" framespacing="0">' . "\n";
-    echo '    <frame src="left.php3?' . $url_query . '&amp;hash=' . $phpmain_hash . '" name="nav" frameborder="0" />' . "\n";
+    echo '    <frame src="left.php?' . $url_query . '&amp;hash=' . $phpmain_hash . '" name="nav" frameborder="0" />' . "\n";
     echo '    <frame src="' . (empty($db) ? $cfg['DefaultTabServer']  : $cfg['DefaultTabDatabase']) . '?' . $url_query . '" name="phpmain' . $phpmain_hash . '" frameborder="1" />' . "\n";
 
 }
diff --git a/lang/add_message.sh b/lang/add_message.sh
index ec400a0d6..e66a80c7c 100644
--- a/lang/add_message.sh
+++ b/lang/add_message.sh
@@ -11,7 +11,7 @@ if [ $# -ne 2 ] ; then
     exit 1
 fi
     
-for file in *.inc.php3
+for file in *.inc.php
 do
         echo $file " "
         grep -v '?>' ${file} > ${file}.new
diff --git a/lang/add_message_file.sh b/lang/add_message_file.sh
index 37a571b26..a5379f4f8 100755
--- a/lang/add_message_file.sh
+++ b/lang/add_message_file.sh
@@ -11,7 +11,7 @@ if [ $# -ne 1 ] ; then
     exit 1
 fi
     
-for file in *.inc.php3
+for file in *.inc.php
 do
     echo $file " "
     grep -v '?>' ${file} > ${file}.new
diff --git a/lang/afrikaans-iso-8859-1.inc.php3 b/lang/afrikaans-iso-8859-1.inc.php
similarity index 100%
rename from lang/afrikaans-iso-8859-1.inc.php3
rename to lang/afrikaans-iso-8859-1.inc.php
diff --git a/lang/afrikaans-utf-8.inc.php3 b/lang/afrikaans-utf-8.inc.php
similarity index 100%
rename from lang/afrikaans-utf-8.inc.php3
rename to lang/afrikaans-utf-8.inc.php
diff --git a/lang/albanian-iso-8859-1.inc.php3 b/lang/albanian-iso-8859-1.inc.php
similarity index 100%
rename from lang/albanian-iso-8859-1.inc.php3
rename to lang/albanian-iso-8859-1.inc.php
diff --git a/lang/albanian-utf-8.inc.php3 b/lang/albanian-utf-8.inc.php
similarity index 100%
rename from lang/albanian-utf-8.inc.php3
rename to lang/albanian-utf-8.inc.php
diff --git a/lang/arabic-utf-8.inc.php3 b/lang/arabic-utf-8.inc.php
similarity index 100%
rename from lang/arabic-utf-8.inc.php3
rename to lang/arabic-utf-8.inc.php
diff --git a/lang/arabic-windows-1256.inc.php3 b/lang/arabic-windows-1256.inc.php
similarity index 100%
rename from lang/arabic-windows-1256.inc.php3
rename to lang/arabic-windows-1256.inc.php
diff --git a/lang/azerbaijani-iso-8859-9.inc.php3 b/lang/azerbaijani-iso-8859-9.inc.php
similarity index 100%
rename from lang/azerbaijani-iso-8859-9.inc.php3
rename to lang/azerbaijani-iso-8859-9.inc.php
diff --git a/lang/azerbaijani-utf-8.inc.php3 b/lang/azerbaijani-utf-8.inc.php
similarity index 100%
rename from lang/azerbaijani-utf-8.inc.php3
rename to lang/azerbaijani-utf-8.inc.php
diff --git a/lang/bosnian-utf-8.inc.php3 b/lang/bosnian-utf-8.inc.php
similarity index 100%
rename from lang/bosnian-utf-8.inc.php3
rename to lang/bosnian-utf-8.inc.php
diff --git a/lang/bosnian-windows-1250.inc.php3 b/lang/bosnian-windows-1250.inc.php
similarity index 100%
rename from lang/bosnian-windows-1250.inc.php3
rename to lang/bosnian-windows-1250.inc.php
diff --git a/lang/brazilian_portuguese-iso-8859-1.inc.php3 b/lang/brazilian_portuguese-iso-8859-1.inc.php
similarity index 99%
rename from lang/brazilian_portuguese-iso-8859-1.inc.php3
rename to lang/brazilian_portuguese-iso-8859-1.inc.php
index 9158218f9..c3f845d51 100644
--- a/lang/brazilian_portuguese-iso-8859-1.inc.php3
+++ b/lang/brazilian_portuguese-iso-8859-1.inc.php
@@ -409,8 +409,8 @@ $strPdfInvalidTblName = 'The "%s" table does not exist!';  //to translate
 $strPdfNoTables = 'No tables';  //to translate
 $strPhp = 'Create PHP Code';  //to translate
 
-$strQBEDel = 'Del';  //to translate (used in tbl_qbe.php3)
-$strQBEIns = 'Ins';  //to translate (used in tbl_qbe.php3)
+$strQBEDel = 'Del';  //to translate (used in tbl_qbe.php)
+$strQBEIns = 'Ins';  //to translate (used in tbl_qbe.php)
 
 $strRelationNotWorking = 'The additional Features for working with linked Tables have been deactivated. To find out why click %shere%s.';  //to translate
 $strRelationView = 'Relation view';  //to translate
diff --git a/lang/brazilian_portuguese-utf-8.inc.php3 b/lang/brazilian_portuguese-utf-8.inc.php
similarity index 99%
rename from lang/brazilian_portuguese-utf-8.inc.php3
rename to lang/brazilian_portuguese-utf-8.inc.php
index e926e3e7f..490045afd 100644
--- a/lang/brazilian_portuguese-utf-8.inc.php3
+++ b/lang/brazilian_portuguese-utf-8.inc.php
@@ -410,8 +410,8 @@ $strPdfInvalidTblName = 'The "%s" table does not exist!';  //to translate
 $strPdfNoTables = 'No tables';  //to translate
 $strPhp = 'Create PHP Code';  //to translate
 
-$strQBEDel = 'Del';  //to translate (used in tbl_qbe.php3)
-$strQBEIns = 'Ins';  //to translate (used in tbl_qbe.php3)
+$strQBEDel = 'Del';  //to translate (used in tbl_qbe.php)
+$strQBEIns = 'Ins';  //to translate (used in tbl_qbe.php)
 
 $strRelationNotWorking = 'The additional Features for working with linked Tables have been deactivated. To find out why click %shere%s.';  //to translate
 $strRelationView = 'Relation view';  //to translate
diff --git a/lang/bulgarian-koi8-r.inc.php3 b/lang/bulgarian-koi8-r.inc.php
similarity index 100%
rename from lang/bulgarian-koi8-r.inc.php3
rename to lang/bulgarian-koi8-r.inc.php
diff --git a/lang/bulgarian-utf-8.inc.php3 b/lang/bulgarian-utf-8.inc.php
similarity index 100%
rename from lang/bulgarian-utf-8.inc.php3
rename to lang/bulgarian-utf-8.inc.php
diff --git a/lang/bulgarian-windows-1251.inc.php3 b/lang/bulgarian-windows-1251.inc.php
similarity index 100%
rename from lang/bulgarian-windows-1251.inc.php3
rename to lang/bulgarian-windows-1251.inc.php
diff --git a/lang/catalan-iso-8859-1.inc.php3 b/lang/catalan-iso-8859-1.inc.php
similarity index 100%
rename from lang/catalan-iso-8859-1.inc.php3
rename to lang/catalan-iso-8859-1.inc.php
diff --git a/lang/catalan-utf-8.inc.php3 b/lang/catalan-utf-8.inc.php
similarity index 100%
rename from lang/catalan-utf-8.inc.php3
rename to lang/catalan-utf-8.inc.php
diff --git a/lang/check_lang.sh b/lang/check_lang.sh
index e1a6eb114..c143e5849 100755
--- a/lang/check_lang.sh
+++ b/lang/check_lang.sh
@@ -7,9 +7,9 @@
 # Robin Johnson <robbat2@users.sourceforge.net>
 # August 9, 2002
 ##
-MASTER="english-iso-8859-1.inc.php3"
+MASTER="english-iso-8859-1.inc.php"
 TMPDIR="tmp-check"
-FILEPAT="*.inc.php3"
+FILEPAT="*.inc.php"
 STRINGSTRING='^[[:space:]]*\$[[:alnum:]_]*[[:blank:]]* ='
 
 rm -rf $TMPDIR
diff --git a/lang/chinese_big5-utf-8.inc.php3 b/lang/chinese_big5-utf-8.inc.php
similarity index 100%
rename from lang/chinese_big5-utf-8.inc.php3
rename to lang/chinese_big5-utf-8.inc.php
diff --git a/lang/chinese_big5.inc.php3 b/lang/chinese_big5.inc.php
similarity index 100%
rename from lang/chinese_big5.inc.php3
rename to lang/chinese_big5.inc.php
diff --git a/lang/chinese_gb-utf-8.inc.php3 b/lang/chinese_gb-utf-8.inc.php
similarity index 100%
rename from lang/chinese_gb-utf-8.inc.php3
rename to lang/chinese_gb-utf-8.inc.php
diff --git a/lang/chinese_gb.inc.php3 b/lang/chinese_gb.inc.php
similarity index 100%
rename from lang/chinese_gb.inc.php3
rename to lang/chinese_gb.inc.php
diff --git a/lang/croatian-iso-8859-2.inc.php3 b/lang/croatian-iso-8859-2.inc.php
similarity index 100%
rename from lang/croatian-iso-8859-2.inc.php3
rename to lang/croatian-iso-8859-2.inc.php
diff --git a/lang/croatian-utf-8.inc.php3 b/lang/croatian-utf-8.inc.php
similarity index 100%
rename from lang/croatian-utf-8.inc.php3
rename to lang/croatian-utf-8.inc.php
diff --git a/lang/croatian-windows-1250.inc.php3 b/lang/croatian-windows-1250.inc.php
similarity index 100%
rename from lang/croatian-windows-1250.inc.php3
rename to lang/croatian-windows-1250.inc.php
diff --git a/lang/czech-iso-8859-2.inc.php3 b/lang/czech-iso-8859-2.inc.php
similarity index 99%
rename from lang/czech-iso-8859-2.inc.php3
rename to lang/czech-iso-8859-2.inc.php
index e592ea12c..e07c2e297 100644
--- a/lang/czech-iso-8859-2.inc.php3
+++ b/lang/czech-iso-8859-2.inc.php
@@ -27,7 +27,7 @@ $strAPrimaryKey = 'V&nbsp;tabulce %s byl vytvo
 $strAbortedClients = 'Pøeru¹ené';
 $strAbsolutePathToDocSqlDir = 'Zadejte absolutní cestu docSQL adresáøe na serveru';
 $strAccessDenied = 'Pøístup odepøen';
-$strAccessDeniedExplanation = 'phpMyAdmin se pokusil pøipojit k&nbsp;MySQL serveru, a ten odmítl pøipojení. Zkontrolujte jméno serveru, u¾ivatelské jméno a heslo v&nbsp;souboru config.inc.php3 a ujistìte se, ¾e jsou toto¾né s&nbsp;tìmi co máte od administrátora MySQL serveru.';
+$strAccessDeniedExplanation = 'phpMyAdmin se pokusil pøipojit k&nbsp;MySQL serveru, a ten odmítl pøipojení. Zkontrolujte jméno serveru, u¾ivatelské jméno a heslo v&nbsp;souboru config.inc.php a ujistìte se, ¾e jsou toto¾né s&nbsp;tìmi co máte od administrátora MySQL serveru.';
 $strAction = 'Akce';
 $strAddAutoIncrement = 'Pøidat hodnotu AUTO_INCREMENT';
 $strAddDeleteColumn = 'Pøidat/Smazat sloupec';
diff --git a/lang/czech-utf-8.inc.php3 b/lang/czech-utf-8.inc.php
similarity index 99%
rename from lang/czech-utf-8.inc.php3
rename to lang/czech-utf-8.inc.php
index e91f7a4fb..efbe6664a 100644
--- a/lang/czech-utf-8.inc.php3
+++ b/lang/czech-utf-8.inc.php
@@ -28,7 +28,7 @@ $strAPrimaryKey = 'V&nbsp;tabulce %s byl vytvořen primární klí�';
 $strAbortedClients = 'Přerušené';
 $strAbsolutePathToDocSqlDir = 'Zadejte absolutní cestu docSQL adresáře na serveru';
 $strAccessDenied = 'Přístup odepřen';
-$strAccessDeniedExplanation = 'phpMyAdmin se pokusil připojit k&nbsp;MySQL serveru, a ten odmítl připojení. Zkontrolujte jméno serveru, uživatelské jméno a heslo v&nbsp;souboru config.inc.php3 a ujistěte se, že jsou totožné s&nbsp;těmi co máte od administrátora MySQL serveru.';
+$strAccessDeniedExplanation = 'phpMyAdmin se pokusil připojit k&nbsp;MySQL serveru, a ten odmítl připojení. Zkontrolujte jméno serveru, uživatelské jméno a heslo v&nbsp;souboru config.inc.php a ujistěte se, že jsou totožné s&nbsp;těmi co máte od administrátora MySQL serveru.';
 $strAction = 'Akce';
 $strAddAutoIncrement = 'Přidat hodnotu AUTO_INCREMENT';
 $strAddDeleteColumn = 'Přidat/Smazat sloupec';
diff --git a/lang/czech-windows-1250.inc.php3 b/lang/czech-windows-1250.inc.php
similarity index 99%
rename from lang/czech-windows-1250.inc.php3
rename to lang/czech-windows-1250.inc.php
index 5232a5427..5c947f701 100644
--- a/lang/czech-windows-1250.inc.php3
+++ b/lang/czech-windows-1250.inc.php
@@ -27,7 +27,7 @@ $strAPrimaryKey = 'V&nbsp;tabulce %s byl vytvo
 $strAbortedClients = 'Pøerušené';
 $strAbsolutePathToDocSqlDir = 'Zadejte absolutní cestu docSQL adresáøe na serveru';
 $strAccessDenied = 'Pøístup odepøen';
-$strAccessDeniedExplanation = 'phpMyAdmin se pokusil pøipojit k&nbsp;MySQL serveru, a ten odmítl pøipojení. Zkontrolujte jméno serveru, uživatelské jméno a heslo v&nbsp;souboru config.inc.php3 a ujistìte se, že jsou totožné s&nbsp;tìmi co máte od administrátora MySQL serveru.';
+$strAccessDeniedExplanation = 'phpMyAdmin se pokusil pøipojit k&nbsp;MySQL serveru, a ten odmítl pøipojení. Zkontrolujte jméno serveru, uživatelské jméno a heslo v&nbsp;souboru config.inc.php a ujistìte se, že jsou totožné s&nbsp;tìmi co máte od administrátora MySQL serveru.';
 $strAction = 'Akce';
 $strAddAutoIncrement = 'Pøidat hodnotu AUTO_INCREMENT';
 $strAddDeleteColumn = 'Pøidat/Smazat sloupec';
diff --git a/lang/danish-iso-8859-1.inc.php3 b/lang/danish-iso-8859-1.inc.php
similarity index 100%
rename from lang/danish-iso-8859-1.inc.php3
rename to lang/danish-iso-8859-1.inc.php
diff --git a/lang/danish-utf-8.inc.php3 b/lang/danish-utf-8.inc.php
similarity index 100%
rename from lang/danish-utf-8.inc.php3
rename to lang/danish-utf-8.inc.php
diff --git a/lang/dutch-iso-8859-1.inc.php3 b/lang/dutch-iso-8859-1.inc.php
similarity index 100%
rename from lang/dutch-iso-8859-1.inc.php3
rename to lang/dutch-iso-8859-1.inc.php
diff --git a/lang/dutch-utf-8.inc.php3 b/lang/dutch-utf-8.inc.php
similarity index 100%
rename from lang/dutch-utf-8.inc.php3
rename to lang/dutch-utf-8.inc.php
diff --git a/lang/english-iso-8859-1.inc.php3 b/lang/english-iso-8859-1.inc.php
similarity index 100%
rename from lang/english-iso-8859-1.inc.php3
rename to lang/english-iso-8859-1.inc.php
diff --git a/lang/english-utf-8.inc.php3 b/lang/english-utf-8.inc.php
similarity index 100%
rename from lang/english-utf-8.inc.php3
rename to lang/english-utf-8.inc.php
diff --git a/lang/estonian-iso-8859-1.inc.php3 b/lang/estonian-iso-8859-1.inc.php
similarity index 100%
rename from lang/estonian-iso-8859-1.inc.php3
rename to lang/estonian-iso-8859-1.inc.php
diff --git a/lang/estonian-utf-8.inc.php3 b/lang/estonian-utf-8.inc.php
similarity index 100%
rename from lang/estonian-utf-8.inc.php3
rename to lang/estonian-utf-8.inc.php
diff --git a/lang/finnish-iso-8859-1.inc.php3 b/lang/finnish-iso-8859-1.inc.php
similarity index 100%
rename from lang/finnish-iso-8859-1.inc.php3
rename to lang/finnish-iso-8859-1.inc.php
diff --git a/lang/finnish-utf-8.inc.php3 b/lang/finnish-utf-8.inc.php
similarity index 100%
rename from lang/finnish-utf-8.inc.php3
rename to lang/finnish-utf-8.inc.php
diff --git a/lang/french-iso-8859-1.inc.php3 b/lang/french-iso-8859-1.inc.php
similarity index 100%
rename from lang/french-iso-8859-1.inc.php3
rename to lang/french-iso-8859-1.inc.php
diff --git a/lang/french-utf-8.inc.php3 b/lang/french-utf-8.inc.php
similarity index 100%
rename from lang/french-utf-8.inc.php3
rename to lang/french-utf-8.inc.php
diff --git a/lang/galician-iso-8859-1.inc.php3 b/lang/galician-iso-8859-1.inc.php
similarity index 100%
rename from lang/galician-iso-8859-1.inc.php3
rename to lang/galician-iso-8859-1.inc.php
diff --git a/lang/galician-utf-8.inc.php3 b/lang/galician-utf-8.inc.php
similarity index 100%
rename from lang/galician-utf-8.inc.php3
rename to lang/galician-utf-8.inc.php
diff --git a/lang/georgian-utf-8.inc.php3 b/lang/georgian-utf-8.inc.php
similarity index 100%
rename from lang/georgian-utf-8.inc.php3
rename to lang/georgian-utf-8.inc.php
diff --git a/lang/german-iso-8859-1.inc.php3 b/lang/german-iso-8859-1.inc.php
similarity index 100%
rename from lang/german-iso-8859-1.inc.php3
rename to lang/german-iso-8859-1.inc.php
diff --git a/lang/german-utf-8.inc.php3 b/lang/german-utf-8.inc.php
similarity index 100%
rename from lang/german-utf-8.inc.php3
rename to lang/german-utf-8.inc.php
diff --git a/lang/greek-iso-8859-7.inc.php3 b/lang/greek-iso-8859-7.inc.php
similarity index 100%
rename from lang/greek-iso-8859-7.inc.php3
rename to lang/greek-iso-8859-7.inc.php
diff --git a/lang/greek-utf-8.inc.php3 b/lang/greek-utf-8.inc.php
similarity index 100%
rename from lang/greek-utf-8.inc.php3
rename to lang/greek-utf-8.inc.php
diff --git a/lang/hebrew-iso-8859-8-i.inc.php3 b/lang/hebrew-iso-8859-8-i.inc.php
similarity index 100%
rename from lang/hebrew-iso-8859-8-i.inc.php3
rename to lang/hebrew-iso-8859-8-i.inc.php
diff --git a/lang/hindi-utf-8.inc.php3 b/lang/hindi-utf-8.inc.php
similarity index 100%
rename from lang/hindi-utf-8.inc.php3
rename to lang/hindi-utf-8.inc.php
diff --git a/lang/hungarian-iso-8859-2.inc.php3 b/lang/hungarian-iso-8859-2.inc.php
similarity index 100%
rename from lang/hungarian-iso-8859-2.inc.php3
rename to lang/hungarian-iso-8859-2.inc.php
diff --git a/lang/hungarian-utf-8.inc.php3 b/lang/hungarian-utf-8.inc.php
similarity index 100%
rename from lang/hungarian-utf-8.inc.php3
rename to lang/hungarian-utf-8.inc.php
diff --git a/lang/indonesian-iso-8859-1.inc.php3 b/lang/indonesian-iso-8859-1.inc.php
similarity index 100%
rename from lang/indonesian-iso-8859-1.inc.php3
rename to lang/indonesian-iso-8859-1.inc.php
diff --git a/lang/indonesian-utf-8.inc.php3 b/lang/indonesian-utf-8.inc.php
similarity index 100%
rename from lang/indonesian-utf-8.inc.php3
rename to lang/indonesian-utf-8.inc.php
diff --git a/lang/italian-iso-8859-1.inc.php3 b/lang/italian-iso-8859-1.inc.php
similarity index 100%
rename from lang/italian-iso-8859-1.inc.php3
rename to lang/italian-iso-8859-1.inc.php
diff --git a/lang/italian-utf-8.inc.php3 b/lang/italian-utf-8.inc.php
similarity index 100%
rename from lang/italian-utf-8.inc.php3
rename to lang/italian-utf-8.inc.php
diff --git a/lang/japanese-euc.inc.php3 b/lang/japanese-euc.inc.php
similarity index 100%
rename from lang/japanese-euc.inc.php3
rename to lang/japanese-euc.inc.php
diff --git a/lang/japanese-sjis.inc.php3 b/lang/japanese-sjis.inc.php
similarity index 100%
rename from lang/japanese-sjis.inc.php3
rename to lang/japanese-sjis.inc.php
diff --git a/lang/japanese-utf-8.inc.php3 b/lang/japanese-utf-8.inc.php
similarity index 100%
rename from lang/japanese-utf-8.inc.php3
rename to lang/japanese-utf-8.inc.php
diff --git a/lang/korean-ks_c_5601-1987.inc.php3 b/lang/korean-ks_c_5601-1987.inc.php
similarity index 100%
rename from lang/korean-ks_c_5601-1987.inc.php3
rename to lang/korean-ks_c_5601-1987.inc.php
diff --git a/lang/latvian-utf-8.inc.php3 b/lang/latvian-utf-8.inc.php
similarity index 100%
rename from lang/latvian-utf-8.inc.php3
rename to lang/latvian-utf-8.inc.php
diff --git a/lang/latvian-windows-1257.inc.php3 b/lang/latvian-windows-1257.inc.php
similarity index 100%
rename from lang/latvian-windows-1257.inc.php3
rename to lang/latvian-windows-1257.inc.php
diff --git a/lang/lithuanian-utf-8.inc.php3 b/lang/lithuanian-utf-8.inc.php
similarity index 100%
rename from lang/lithuanian-utf-8.inc.php3
rename to lang/lithuanian-utf-8.inc.php
diff --git a/lang/lithuanian-windows-1257.inc.php3 b/lang/lithuanian-windows-1257.inc.php
similarity index 100%
rename from lang/lithuanian-windows-1257.inc.php3
rename to lang/lithuanian-windows-1257.inc.php
diff --git a/lang/malay-iso-8859-1.inc.php3 b/lang/malay-iso-8859-1.inc.php
similarity index 100%
rename from lang/malay-iso-8859-1.inc.php3
rename to lang/malay-iso-8859-1.inc.php
diff --git a/lang/malay-utf-8.inc.php3 b/lang/malay-utf-8.inc.php
similarity index 100%
rename from lang/malay-utf-8.inc.php3
rename to lang/malay-utf-8.inc.php
diff --git a/lang/norwegian-iso-8859-1.inc.php3 b/lang/norwegian-iso-8859-1.inc.php
similarity index 100%
rename from lang/norwegian-iso-8859-1.inc.php3
rename to lang/norwegian-iso-8859-1.inc.php
diff --git a/lang/norwegian-utf-8.inc.php3 b/lang/norwegian-utf-8.inc.php
similarity index 100%
rename from lang/norwegian-utf-8.inc.php3
rename to lang/norwegian-utf-8.inc.php
diff --git a/lang/persian-utf-8.inc.php3 b/lang/persian-utf-8.inc.php
similarity index 100%
rename from lang/persian-utf-8.inc.php3
rename to lang/persian-utf-8.inc.php
diff --git a/lang/persian-windows-1256.inc.php3 b/lang/persian-windows-1256.inc.php
similarity index 100%
rename from lang/persian-windows-1256.inc.php3
rename to lang/persian-windows-1256.inc.php
diff --git a/lang/polish-iso-8859-2.inc.php3 b/lang/polish-iso-8859-2.inc.php
similarity index 100%
rename from lang/polish-iso-8859-2.inc.php3
rename to lang/polish-iso-8859-2.inc.php
diff --git a/lang/polish-utf-8.inc.php3 b/lang/polish-utf-8.inc.php
similarity index 100%
rename from lang/polish-utf-8.inc.php3
rename to lang/polish-utf-8.inc.php
diff --git a/lang/portuguese-iso-8859-1.inc.php3 b/lang/portuguese-iso-8859-1.inc.php
similarity index 100%
rename from lang/portuguese-iso-8859-1.inc.php3
rename to lang/portuguese-iso-8859-1.inc.php
diff --git a/lang/portuguese-utf-8.inc.php3 b/lang/portuguese-utf-8.inc.php
similarity index 100%
rename from lang/portuguese-utf-8.inc.php3
rename to lang/portuguese-utf-8.inc.php
diff --git a/lang/remove_message.sh b/lang/remove_message.sh
index 293270960..7dab14a90 100755
--- a/lang/remove_message.sh
+++ b/lang/remove_message.sh
@@ -12,7 +12,7 @@ if [ $# -ne 1 ] ; then
     exit 1
 fi
     
-for file in *.inc.php3
+for file in *.inc.php
 do
     echo "lines before:" `wc -l $file`
     grep -v "$1 " ${file} > ${file}.new
diff --git a/lang/romanian-iso-8859-1.inc.php3 b/lang/romanian-iso-8859-1.inc.php
similarity index 100%
rename from lang/romanian-iso-8859-1.inc.php3
rename to lang/romanian-iso-8859-1.inc.php
diff --git a/lang/romanian-utf-8.inc.php3 b/lang/romanian-utf-8.inc.php
similarity index 100%
rename from lang/romanian-utf-8.inc.php3
rename to lang/romanian-utf-8.inc.php
diff --git a/lang/russian-dos-866.inc.php3 b/lang/russian-dos-866.inc.php
similarity index 100%
rename from lang/russian-dos-866.inc.php3
rename to lang/russian-dos-866.inc.php
diff --git a/lang/russian-koi8-r.inc.php3 b/lang/russian-koi8-r.inc.php
similarity index 100%
rename from lang/russian-koi8-r.inc.php3
rename to lang/russian-koi8-r.inc.php
diff --git a/lang/russian-utf-8.inc.php3 b/lang/russian-utf-8.inc.php
similarity index 100%
rename from lang/russian-utf-8.inc.php3
rename to lang/russian-utf-8.inc.php
diff --git a/lang/russian-windows-1251.inc.php3 b/lang/russian-windows-1251.inc.php
similarity index 100%
rename from lang/russian-windows-1251.inc.php3
rename to lang/russian-windows-1251.inc.php
diff --git a/lang/serbian_cyrillic-utf-8.inc.php3 b/lang/serbian_cyrillic-utf-8.inc.php
similarity index 100%
rename from lang/serbian_cyrillic-utf-8.inc.php3
rename to lang/serbian_cyrillic-utf-8.inc.php
diff --git a/lang/serbian_cyrillic-windows-1251.inc.php3 b/lang/serbian_cyrillic-windows-1251.inc.php
similarity index 100%
rename from lang/serbian_cyrillic-windows-1251.inc.php3
rename to lang/serbian_cyrillic-windows-1251.inc.php
diff --git a/lang/serbian_latin-utf-8.inc.php3 b/lang/serbian_latin-utf-8.inc.php
similarity index 100%
rename from lang/serbian_latin-utf-8.inc.php3
rename to lang/serbian_latin-utf-8.inc.php
diff --git a/lang/serbian_latin-windows-1250.inc.php3 b/lang/serbian_latin-windows-1250.inc.php
similarity index 100%
rename from lang/serbian_latin-windows-1250.inc.php3
rename to lang/serbian_latin-windows-1250.inc.php
diff --git a/lang/slovak-iso-8859-2.inc.php3 b/lang/slovak-iso-8859-2.inc.php
similarity index 99%
rename from lang/slovak-iso-8859-2.inc.php3
rename to lang/slovak-iso-8859-2.inc.php
index c4fde48a4..094125202 100644
--- a/lang/slovak-iso-8859-2.inc.php3
+++ b/lang/slovak-iso-8859-2.inc.php
@@ -23,7 +23,7 @@ $strAPrimaryKey = 'Bol pridan
 $strAbortedClients = 'Preru¹ené';
 $strAbsolutePathToDocSqlDir = 'Prosím zadajte absolútnu cestu k adresáru docSQL na servere';
 $strAccessDenied = 'Prístup zamietnutý';
-$strAccessDeniedExplanation = 'phpMyAdmin sa pokúsil pripoji» k MySQL serveru ale ten spojenie odmietol. Skontrolujte prosím meno serveru, pou¾ívateµské meno a heslo v súbore config.inc.php3 a s tým, ktoré ste dostali o administrátora MySQL servera.';
+$strAccessDeniedExplanation = 'phpMyAdmin sa pokúsil pripoji» k MySQL serveru ale ten spojenie odmietol. Skontrolujte prosím meno serveru, pou¾ívateµské meno a heslo v súbore config.inc.php a s tým, ktoré ste dostali o administrátora MySQL servera.';
 $strAction = 'Akcia';
 $strAddAutoIncrement = 'Prida» hodnotu AUTO_INCREMENT';
 $strAddDeleteColumn = 'Prida»/Odobra» polia ståpcov';
diff --git a/lang/slovak-utf-8.inc.php3 b/lang/slovak-utf-8.inc.php
similarity index 99%
rename from lang/slovak-utf-8.inc.php3
rename to lang/slovak-utf-8.inc.php
index 1fd6aa487..f127ded17 100644
--- a/lang/slovak-utf-8.inc.php3
+++ b/lang/slovak-utf-8.inc.php
@@ -24,7 +24,7 @@ $strAPrimaryKey = 'Bol pridaný primárny kľú� pre %s';
 $strAbortedClients = 'Prerušené';
 $strAbsolutePathToDocSqlDir = 'Prosím zadajte absolútnu cestu k adresáru docSQL na servere';
 $strAccessDenied = 'Prístup zamietnutý';
-$strAccessDeniedExplanation = 'phpMyAdmin sa pokúsil pripojiť k MySQL serveru ale ten spojenie odmietol. Skontrolujte prosím meno serveru, používateľské meno a heslo v súbore config.inc.php3 a s tým, ktoré ste dostali o administrátora MySQL servera.';
+$strAccessDeniedExplanation = 'phpMyAdmin sa pokúsil pripojiť k MySQL serveru ale ten spojenie odmietol. Skontrolujte prosím meno serveru, používateľské meno a heslo v súbore config.inc.php a s tým, ktoré ste dostali o administrátora MySQL servera.';
 $strAction = 'Akcia';
 $strAddAutoIncrement = 'Pridať hodnotu AUTO_INCREMENT';
 $strAddDeleteColumn = 'Pridať/Odobrať polia stĺpcov';
diff --git a/lang/slovak-windows-1250.inc.php3 b/lang/slovak-windows-1250.inc.php
similarity index 99%
rename from lang/slovak-windows-1250.inc.php3
rename to lang/slovak-windows-1250.inc.php
index da7b65eff..90a1cd127 100644
--- a/lang/slovak-windows-1250.inc.php3
+++ b/lang/slovak-windows-1250.inc.php
@@ -23,7 +23,7 @@ $strAPrimaryKey = 'Bol pridan
 $strAbortedClients = 'Prerušené';
 $strAbsolutePathToDocSqlDir = 'Prosím zadajte absolútnu cestu k adresáru docSQL na servere';
 $strAccessDenied = 'Prístup zamietnutý';
-$strAccessDeniedExplanation = 'phpMyAdmin sa pokúsil pripoji� k MySQL serveru ale ten spojenie odmietol. Skontrolujte prosím meno serveru, používate¾ské meno a heslo v súbore config.inc.php3 a s tým, ktoré ste dostali o administrátora MySQL servera.';
+$strAccessDeniedExplanation = 'phpMyAdmin sa pokúsil pripoji� k MySQL serveru ale ten spojenie odmietol. Skontrolujte prosím meno serveru, používate¾ské meno a heslo v súbore config.inc.php a s tým, ktoré ste dostali o administrátora MySQL servera.';
 $strAction = 'Akcia';
 $strAddAutoIncrement = 'Prida� hodnotu AUTO_INCREMENT';
 $strAddDeleteColumn = 'Prida�/Odobra� polia ståpcov';
diff --git a/lang/slovenian-iso-8859-2.inc.php3 b/lang/slovenian-iso-8859-2.inc.php
similarity index 100%
rename from lang/slovenian-iso-8859-2.inc.php3
rename to lang/slovenian-iso-8859-2.inc.php
diff --git a/lang/slovenian-utf-8.inc.php3 b/lang/slovenian-utf-8.inc.php
similarity index 100%
rename from lang/slovenian-utf-8.inc.php3
rename to lang/slovenian-utf-8.inc.php
diff --git a/lang/slovenian-windows-1250.inc.php3 b/lang/slovenian-windows-1250.inc.php
similarity index 100%
rename from lang/slovenian-windows-1250.inc.php3
rename to lang/slovenian-windows-1250.inc.php
diff --git a/lang/spanish-iso-8859-1.inc.php3 b/lang/spanish-iso-8859-1.inc.php
similarity index 100%
rename from lang/spanish-iso-8859-1.inc.php3
rename to lang/spanish-iso-8859-1.inc.php
diff --git a/lang/spanish-utf-8.inc.php3 b/lang/spanish-utf-8.inc.php
similarity index 100%
rename from lang/spanish-utf-8.inc.php3
rename to lang/spanish-utf-8.inc.php
diff --git a/lang/swedish-iso-8859-1.inc.php3 b/lang/swedish-iso-8859-1.inc.php
similarity index 100%
rename from lang/swedish-iso-8859-1.inc.php3
rename to lang/swedish-iso-8859-1.inc.php
diff --git a/lang/swedish-utf-8.inc.php3 b/lang/swedish-utf-8.inc.php
similarity index 100%
rename from lang/swedish-utf-8.inc.php3
rename to lang/swedish-utf-8.inc.php
diff --git a/lang/sync_lang.sh b/lang/sync_lang.sh
index d0c83d4fa..f5e8a9d6c 100755
--- a/lang/sync_lang.sh
+++ b/lang/sync_lang.sh
@@ -11,6 +11,8 @@
 # Written by Michal Cihar <nijel at users.sourceforge.net>
 ##
 # Changes:
+# 2003-11-18
+#   * switch php3 -> php
 # 2003-04-14
 #   * convert only files that are needed to convert (checks mtime), --force to
 #     avoid this checking
@@ -67,7 +69,7 @@ fi
 # names of translations to process
 ##
 # Here should be listed all translations for which conversion should be done.
-# The name is filename without inc.php3.
+# The name is filename without inc.php.
 #
 BASE_TRANSLATIONS=`cat <<EOT
 afrikaans-iso-8859-1
@@ -167,14 +169,14 @@ for base in $BASE_TRANSLATIONS ; do
     # grep language from basename
     lang=$(echo $base|sed 's%-.*%%')
     # which files will we create from current?
-    create_files=$(ls --color=none -1 $lang*.inc.php3|grep -v $base.inc.php3)
+    create_files=$(ls --color=none -1 $lang*.inc.php|grep -v $base.inc.php)
 
     for ignore in $IGNORE_TRANSLATIONS ; do
         create_files=$(echo "$create_files" | grep -v $ignore)
     done
 
     # charset of source file
-    src_charset=$(grep '\$charset' $base.inc.php3 | sed "s%^[^'\"]*['\"]\\([^'\"]*\\)['\"][^'\"]*$%\\1%")
+    src_charset=$(grep '\$charset' $base.inc.php | sed "s%^[^'\"]*['\"]\\([^'\"]*\\)['\"][^'\"]*$%\\1%")
     echo "$base [charset $src_charset]"
 
     is_utf=no
@@ -186,11 +188,11 @@ for base in $BASE_TRANSLATIONS ; do
         # grepping from file causes problems when it is empty...
         charset=$(grep '\$charset' $file | sed "s%^[^'\"]*['\"]\\([^'\"]*\\)['\"][^'\"]*$%\\1%")
         if [ -z "$charset" ] ; then
-            charset=$(echo $file | sed -e 's/^[^-]*-//' -e 's/\.inc\.php3\?$//')
+            charset=$(echo $file | sed -e 's/^[^-]*-//' -e 's/\.inc\.php\?$//')
         fi
 
         # check whether we need to update translation
-        if [ ! "$base.inc.php3" -nt "$file" -a "$FORCE" -eq 0 -a -s "$file" ] ; then
+        if [ ! "$base.inc.php" -nt "$file" -a "$FORCE" -eq 0 -a -s "$file" ] ; then
             if [ $charset = 'utf-8' ] ; then
                 is_utf=yes
             fi
@@ -202,7 +204,7 @@ for base in $BASE_TRANSLATIONS ; do
         if [ $charset = 'utf-8' ] ; then
             # if we convert to utf-8, we should add allow_recoding
             is_utf=yes
-            $CONVERTOR $(printf "$CONVERTOR_PARAMS" $src_charset $charset) < $base.inc.php3| sed -e "s/$src_charset/$charset/" -e '/\$charset/a\
+            $CONVERTOR $(printf "$CONVERTOR_PARAMS" $src_charset $charset) < $base.inc.php| sed -e "s/$src_charset/$charset/" -e '/\$charset/a\
 $allow_recoding = TRUE;' > $TEMPFILE
             if [ -s $TEMPFILE ] ; then
                 cat $TEMPFILE > $file
@@ -213,7 +215,7 @@ $allow_recoding = TRUE;' > $TEMPFILE
             fi
         elif [ $src_charset = 'utf-8' ] ; then
             # if we convert from utf-8, we should remove allow_recoding
-            $CONVERTOR $(printf "$CONVERTOR_PARAMS" $src_charset $charset) < $base.inc.php3| grep -v allow_recoding > $TEMPFILE
+            $CONVERTOR $(printf "$CONVERTOR_PARAMS" $src_charset $charset) < $base.inc.php| grep -v allow_recoding > $TEMPFILE
             if [ -s $TEMPFILE ] ; then
                 cat $TEMPFILE > $file
                 echo done
@@ -223,7 +225,7 @@ $allow_recoding = TRUE;' > $TEMPFILE
             fi
         else
             # just convert
-            $CONVERTOR $(printf "$CONVERTOR_PARAMS" $src_charset $charset) < $base.inc.php3| sed "s/$src_charset/$charset/" > $TEMPFILE
+            $CONVERTOR $(printf "$CONVERTOR_PARAMS" $src_charset $charset) < $base.inc.php| sed "s/$src_charset/$charset/" > $TEMPFILE
             if [ -s $TEMPFILE ] ; then
                 cat $TEMPFILE > $file
                 echo done
@@ -243,8 +245,8 @@ $allow_recoding = TRUE;' > $TEMPFILE
             # we should create utf-8 translation
             echo -n " creating utf-8 translation ... "
             charset=utf-8
-            file=$lang-$charset.inc.php3
-            $CONVERTOR $(printf "$CONVERTOR_PARAMS" $src_charset $charset) < $base.inc.php3| sed -e "s/$src_charset/$charset/" -e '/\$charset/a\
+            file=$lang-$charset.inc.php
+            $CONVERTOR $(printf "$CONVERTOR_PARAMS" $src_charset $charset) < $base.inc.php| sed -e "s/$src_charset/$charset/" -e '/\$charset/a\
 $allow_recoding = TRUE;' > $TEMPFILE
             if [ -s $TEMPFILE ] ; then
                 cat $TEMPFILE > $file
diff --git a/lang/thai-tis-620.inc.php3 b/lang/thai-tis-620.inc.php
similarity index 100%
rename from lang/thai-tis-620.inc.php3
rename to lang/thai-tis-620.inc.php
diff --git a/lang/thai-utf-8.inc.php3 b/lang/thai-utf-8.inc.php
similarity index 100%
rename from lang/thai-utf-8.inc.php3
rename to lang/thai-utf-8.inc.php
diff --git a/lang/translatecount.sh b/lang/translatecount.sh
index a77528998..908166eb6 100755
--- a/lang/translatecount.sh
+++ b/lang/translatecount.sh
@@ -11,10 +11,10 @@
 srcfilelist=${@}
 destfilelist=""
 translationmatch='//to translate'
-suffixtoremove='.inc.php3'
+suffixtoremove='.inc.php'
 added=0
 if [ -z "${srcfilelist}" ]; then
-  srcfilelist="*.inc.php3"
+  srcfilelist="*.inc.php"
   added=1
 fi;
 for i in ${srcfilelist}; do 
@@ -25,7 +25,7 @@ for i in ${srcfilelist}; do
     destfilelist="${destfilelist} ${i}"
   fi;
 done;
-destfilelist=`echo ${destfilelist} | xargs -n1 | egrep '.inc.php3$'` 
+destfilelist=`echo ${destfilelist} | xargs -n1 | egrep '.inc.php$'` 
 if [ ! -z "${destfilelist}" ]; then
   grep -c -- "${translationmatch}" ${destfilelist} | sort -t':' -n +1  | sed -e "s/${suffixtoremove}//g" | xargs -n1 | egrep -v ':0$' 
 fi;
diff --git a/lang/turkish-iso-8859-9.inc.php3 b/lang/turkish-iso-8859-9.inc.php
similarity index 100%
rename from lang/turkish-iso-8859-9.inc.php3
rename to lang/turkish-iso-8859-9.inc.php
diff --git a/lang/turkish-utf-8.inc.php3 b/lang/turkish-utf-8.inc.php
similarity index 100%
rename from lang/turkish-utf-8.inc.php3
rename to lang/turkish-utf-8.inc.php
diff --git a/lang/ukrainian-utf-8.inc.php3 b/lang/ukrainian-utf-8.inc.php
similarity index 100%
rename from lang/ukrainian-utf-8.inc.php3
rename to lang/ukrainian-utf-8.inc.php
diff --git a/lang/ukrainian-windows-1251.inc.php3 b/lang/ukrainian-windows-1251.inc.php
similarity index 100%
rename from lang/ukrainian-windows-1251.inc.php3
rename to lang/ukrainian-windows-1251.inc.php
diff --git a/ldi_check.php3 b/ldi_check.php
old mode 100755
new mode 100644
similarity index 95%
rename from ldi_check.php3
rename to ldi_check.php
index 49a8d2e8d..107f3200d
--- a/ldi_check.php3
+++ b/ldi_check.php
@@ -18,8 +18,8 @@
 /**
  * Gets some core scripts
  */
-require('./libraries/grab_globals.lib.php3');
-require('./libraries/common.lib.php3');
+require('./libraries/grab_globals.lib.php');
+require('./libraries/common.lib.php');
 
 // Check parameters
 
@@ -96,9 +96,9 @@ if (isset($btnLDI) && isset($local_textfile) && $local_textfile != '') {
  */
 if (isset($btnLDI) && empty($textfile)) {
     $js_to_run = 'functions.js';
-    include('./header.inc.php3');
+    include('./header.inc.php');
     $message = $strMustSelectFile;
-    include('./ldi_table.php3');
+    include('./ldi_table.php');
 } elseif (isset($btnLDI) && ($textfile != 'none')) {
     if (!isset($replace)) {
         $replace = '';
@@ -176,9 +176,9 @@ if (isset($btnLDI) && empty($textfile)) {
     // We could rename the ldi* scripts to tbl_properties_ldi* to improve
     // consistency with the other sub-pages.
     //
-    // The $goto in ldi_table.php3 is set to tbl_properties.php3 but maybe
+    // The $goto in ldi_table.php is set to tbl_properties.php but maybe
     // if would be better to Browse the latest inserted data.
-    include('./sql.php3');
+    include('./sql.php');
     if ($unlink_local_textfile) {
         unlink($textfile);
     }
@@ -189,6 +189,6 @@ if (isset($btnLDI) && empty($textfile)) {
  * The form used to define the query hasn't been yet submitted -> loads it
  */
 else {
-    include('./ldi_table.php3');
+    include('./ldi_table.php');
 }
 ?>
diff --git a/ldi_table.php3 b/ldi_table.php
old mode 100755
new mode 100644
similarity index 94%
rename from ldi_table.php3
rename to ldi_table.php
index fab780329..f6bb48492
--- a/ldi_table.php3
+++ b/ldi_table.php
@@ -7,11 +7,11 @@
  * This file defines the forms used to insert a textfile into a table
  */
 
-require('./libraries/grab_globals.lib.php3');
+require('./libraries/grab_globals.lib.php');
 
 // Check parameters
 if (!defined('PMA_COMMON_LIB_INCLUDED')) {
-    include('./libraries/common.lib.php3');
+    include('./libraries/common.lib.php');
 }
 PMA_checkParameters(array('db', 'table'));
 
@@ -19,16 +19,16 @@ PMA_checkParameters(array('db', 'table'));
 /**
  * Gets some core libraries and displays links
  */
-require('./tbl_properties_common.php3');
-$err_url   = 'ldi_table.php3' . $err_url;
-$url_query .= '&amp;goto=ldi_table.php3&amp;back=ldi_table.php3';
-require('./tbl_properties_table_info.php3');
+require('./tbl_properties_common.php');
+$err_url   = 'ldi_table.php' . $err_url;
+$url_query .= '&amp;goto=ldi_table.php&amp;back=ldi_table.php';
+require('./tbl_properties_table_info.php');
 
 /**
  * Displays the form
  */
 ?>
-<form action="ldi_check.php3" method="post" enctype="multipart/form-data">
+<form action="ldi_check.php" method="post" enctype="multipart/form-data">
     <table cellpadding="5" border="2">
     <tr>
         <td><?php echo $strLocationTextfile; ?></td>
@@ -179,8 +179,8 @@ if (PMA_MYSQL_INT_VERSION > 40003) {
         <td colspan="3" align="center">
             <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
             <input type="hidden" name="zero_rows" value="<?php echo $strTheContent; ?>" />
-            <input type="hidden" name="goto" value="tbl_properties.php3" />
-            <input type="hidden" name="back" value="ldi_table.php3" />
+            <input type="hidden" name="goto" value="tbl_properties.php" />
+            <input type="hidden" name="back" value="ldi_table.php" />
             <input type="hidden" name="into_table" value="<?php echo htmlspecialchars($table); ?>" />
             <input type="submit" name="btnLDI" value="<?php echo $strSubmit; ?>" />&nbsp;&nbsp;
             <input type="reset" value="<?php echo $strReset; ?>" />
@@ -194,5 +194,5 @@ if (PMA_MYSQL_INT_VERSION > 40003) {
 /**
  * Displays the footer
  */
-require('./footer.inc.php3');
+require('./footer.inc.php');
 ?>
diff --git a/left.php3 b/left.php
old mode 100755
new mode 100644
similarity index 93%
rename from left.php3
rename to left.php
index fcd48a3cb..93b8776a6
--- a/left.php3
+++ b/left.php
@@ -7,7 +7,7 @@
  * Gets the variables sent to this script, retains the db name that may have
  * been defined as startup option and include a core library
  */
-require('./libraries/grab_globals.lib.php3');
+require('./libraries/grab_globals.lib.php');
 if (isset($lightm_db) && !empty($lightm_db)) {
 // no longer urlencoded because of html entities in the db name
 //    $db = urldecode($lightm_db);
@@ -22,8 +22,8 @@ if (!empty($db)) {
 /**
  * Gets a core script and starts output buffering work
  */
-require('./libraries/common.lib.php3');
-require('./libraries/ob.lib.php3');
+require('./libraries/common.lib.php');
+require('./libraries/ob.lib.php');
 if ($cfg['OBGzip']) {
     $ob_mode = PMA_outBufferModeGet();
     if ($ob_mode) {
@@ -33,8 +33,8 @@ if ($cfg['OBGzip']) {
 
 PMA_checkParameters(array('hash'));
 
-include('./libraries/bookmark.lib.php3');
-require('./libraries/relation.lib.php3');
+include('./libraries/bookmark.lib.php');
+require('./libraries/relation.lib.php');
 $cfgRelation = PMA_getRelationsParam();
 
 function PMA_reduceNest($_table) {
@@ -182,17 +182,17 @@ function PMA_nestedSet($baseid, $tablestack, $key = '__protected__', $keyhistory
  * before the user choose among available ones at the welcome screen.
  */
 if ($server > 0) {
-    PMA_availableDatabases(); // this function is defined in "common.lib.php3"
+    PMA_availableDatabases(); // this function is defined in "common.lib.php"
 } else {
     $num_dbs = 0;
 }
 
 
 // garvin: For re-usability, moved http-headers
-// to a seperate file. It can now be included by header.inc.php3,
-// queryframe.php3, querywindow.php3.
+// to a seperate file. It can now be included by header.inc.php,
+// queryframe.php, querywindow.php.
 
-include('./libraries/header_http.inc.php3');
+include('./libraries/header_http.inc.php');
 
 /**
  * Displays the frame
@@ -218,7 +218,7 @@ if (isset($lightm_db) && !empty($lightm_db)) {
 <?php 
 } elseif (isset($lightm_db)) {
 ?>
-    window.parent.frames['phpmain<?php echo $hash; ?>'].location.replace('./main.php3?<?php echo PMA_generate_common_url('', '', '&');?>');
+    window.parent.frames['phpmain<?php echo $hash; ?>'].location.replace('./main.php?<?php echo PMA_generate_common_url('', '', '&');?>');
 <?php 
 }
 ?>
@@ -262,11 +262,11 @@ if (($num_dbs > 1 || !empty($cfg['LeftFrameTableSeparator'])) && !$cfg['LeftFram
 
     var isServer    = <?php echo ($server > 0) ? 'true' : 'false'; ?>;
 
-    document.writeln('<link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php3?lang=<?php echo $lang; ?>&amp;js_frame=left&amp;js_capable=' + capable + '&amp;js_isDOM=' + isDOM + '&amp;js_isIE4=' + isIE4 + '" />');
+    document.writeln('<link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php?lang=<?php echo $lang; ?>&amp;js_frame=left&amp;js_capable=' + capable + '&amp;js_isDOM=' + isDOM + '&amp;js_isIE4=' + isIE4 + '" />');
     //-->
     </script>
     <noscript>
-        <link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php3?lang=<?php echo $lang; ?>&amp;js_frame=left&amp;js_capable=0&amp;js_isDOM=0&amp;js_isIE4=0" />
+        <link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php?lang=<?php echo $lang; ?>&amp;js_frame=left&amp;js_capable=0&amp;js_isDOM=0&amp;js_isIE4=0" />
     </noscript>
 
     <script src="libraries/left.js" type="text/javascript" language="javascript1.2"></script>
@@ -276,14 +276,14 @@ if (($num_dbs > 1 || !empty($cfg['LeftFrameTableSeparator'])) && !$cfg['LeftFram
 else if ($num_dbs == 1) {
     echo "\n";
     ?>
-    <link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php3?js_frame=left&amp;js_capable=0&amp;js_isDOM=0&amp;js_isIE4=0" />
+    <link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php?js_frame=left&amp;js_capable=0&amp;js_isDOM=0&amp;js_isIE4=0" />
     <?php
 } // end if ($num_dbs == 1)
 
 else {
     echo "\n";
     ?>
-    <link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php3?js_frame=left&amp;num_dbs=0" />
+    <link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php?js_frame=left&amp;num_dbs=0" />
     <?php
 } // end if ($num_dbs < 1)
 
@@ -303,7 +303,7 @@ if ($cfg['LeftDisplayLogo']) {
 echo "\n";
 if ($cfg['LeftDisplayServers']) {
 ?>
-        <form method="post" action="index.php3" target="_parent">
+        <form method="post" action="index.php" target="_parent">
             <select name="server" onchange="this.form.submit();">
     <?php
     echo "\n";
@@ -352,7 +352,7 @@ echo "\n";
 ?>
     <!-- Link to the welcome page -->
     <div id="el1Parent" class="parent" style="margin-bottom: 5px">
-        <nobr><a class="item" href="main.php3?<?php echo PMA_generate_common_url(); ?>"><span class="heada"><b><?php echo $strHome; ?></b></span></a></nobr>
+        <nobr><a class="item" href="main.php?<?php echo PMA_generate_common_url(); ?>"><span class="heada"><b><?php echo $strHome; ?></b></span></a></nobr>
     </div>
 
 
@@ -370,15 +370,15 @@ if ($num_dbs > 1) {
 
     // Light mode -> beginning of the select combo for databases
     // Note: When javascript is active, the frameset will be changed from
-    // within left.php3. With no JS (<noscript>) the whole frameset will
+    // within left.php. With no JS (<noscript>) the whole frameset will
     // be rebuilt with the new target frame.
     if ($cfg['LeftFrameLight']) {
         ?>
         <script type="text/javascript" language="javascript">
-            document.writeln('<form method="post" action="left.php3" name="left" target="nav">');
+            document.writeln('<form method="post" action="left.php" name="left" target="nav">');
         </script>
         <noscript>
-            <form method="post" action="index.php3" name="left" target="_parent">
+            <form method="post" action="index.php" name="left" target="_parent">
         </noscript>
         <?php
         echo PMA_generate_common_hidden_inputs();
@@ -475,7 +475,7 @@ if ($num_dbs > 1) {
 
                 $book_sql_query = PMA_queryBookmarks($db, $cfg['Bookmark'], '\'' . PMA_sqlAddslashes($table) . '\'', 'label');
 
-                $list_item = '<a target="phpmain' . $hash . '" href="sql.php3?' . $common_url_query . '&amp;table=' . urlencode($table) . '&amp;sql_query=' . (isset($book_sql_query) && $book_sql_query != FALSE ? urlencode($book_sql_query) : urlencode('SELECT * FROM ' . PMA_backquote($table))) . '&amp;pos=0&amp;goto=' . $cfg['DefaultTabTable'] . '" title="' . $strBrowse . ': ' . $url_title . '">';
+                $list_item = '<a target="phpmain' . $hash . '" href="sql.php?' . $common_url_query . '&amp;table=' . urlencode($table) . '&amp;sql_query=' . (isset($book_sql_query) && $book_sql_query != FALSE ? urlencode($book_sql_query) : urlencode('SELECT * FROM ' . PMA_backquote($table))) . '&amp;pos=0&amp;goto=' . $cfg['DefaultTabTable'] . '" title="' . $strBrowse . ': ' . $url_title . '">';
                 $list_item .= '<img src="images/button_smallbrowse.png" width="10" height="10" border="0" alt="' . $strBrowse . ': ' . $url_title . '" /></a>';
                 $list_item .= '<bdo dir="' . $text_dir . '">&nbsp;</bdo>' . "\n";
                 $list_item .= '<a class="tblItem" id="tbl_' . md5($table) . '" title="' . $url_title . '" target="phpmain' . $hash . '" href="' . $cfg['DefaultTabTable'] . '?' . $common_url_query . '&amp;table=' . urlencode($table) . '">';
@@ -535,7 +535,7 @@ if ($num_dbs > 1) {
 
                     $book_sql_query = PMA_queryBookmarks($db, $cfg['Bookmark'], '\'' . PMA_sqlAddslashes($table) . '\'', 'label');
 
-                    $table_list .= '    <nobr><a target="phpmain' . $hash . '" href="sql.php3?' . $common_url_query . '&amp;table=' . urlencode($table) . '&amp;sql_query=' . (isset($book_sql_query) && $book_sql_query != FALSE ? urlencode($book_sql_query) : urlencode('SELECT * FROM ' . PMA_backquote($table))) . '&amp;pos=0&amp;goto=' . $cfg['DefaultTabTable'] . '">' . "\n";
+                    $table_list .= '    <nobr><a target="phpmain' . $hash . '" href="sql.php?' . $common_url_query . '&amp;table=' . urlencode($table) . '&amp;sql_query=' . (isset($book_sql_query) && $book_sql_query != FALSE ? urlencode($book_sql_query) : urlencode('SELECT * FROM ' . PMA_backquote($table))) . '&amp;pos=0&amp;goto=' . $cfg['DefaultTabTable'] . '">' . "\n";
                     $table_list .= '              <img src="images/button_smallbrowse.png" width="10" height="10" border="0" alt="' . $strBrowse . ': ' . $url_title . '" title="' . $strBrowse . ': ' . $url_title . '" /></a><bdo dir="' . $text_dir . '">&nbsp;</bdo>' . "\n";
                     if (PMA_USR_BROWSER_AGENT == 'IE') {
                         $table_list .= '          <span class="tblItem"><a class="tblItem" id="tbl_' . md5($table) . '" title="' . $url_title . '" target="phpmain' . $hash . '" href="' . $cfg['DefaultTabTable'] . '?' . $common_url_query . '&amp;table=' . urlencode($table) . '">' . ($alias != '' && $cfg['ShowTooltipAliasTB'] ? $alias : htmlspecialchars($table)) . '</a></span></nobr><br />' . "\n";
@@ -699,13 +699,13 @@ else if ($num_dbs == 1) {
         if ($cfg['LeftFrameLight']) {
         echo "\n";
         ?>
-        <nobr><a target="phpmain<?php echo $hash; ?>" href="sql.php3?<?php echo $common_url_query; ?>&amp;table=<?php echo urlencode($table); ?>&amp;sql_query=<?php echo (isset($book_sql_query) && $book_sql_query != FALSE ? urlencode($book_sql_query) : urlencode('SELECT * FROM ' . PMA_backquote($table))); ?>&amp;pos=0&amp;goto=<?php echo $cfg['DefaultTabTable']; ?>" title="<?php echo $strBrowse . ': ' . $url_title; ?>">
+        <nobr><a target="phpmain<?php echo $hash; ?>" href="sql.php?<?php echo $common_url_query; ?>&amp;table=<?php echo urlencode($table); ?>&amp;sql_query=<?php echo (isset($book_sql_query) && $book_sql_query != FALSE ? urlencode($book_sql_query) : urlencode('SELECT * FROM ' . PMA_backquote($table))); ?>&amp;pos=0&amp;goto=<?php echo $cfg['DefaultTabTable']; ?>" title="<?php echo $strBrowse . ': ' . $url_title; ?>">
                   <img src="images/button_smallbrowse.png" width="10" height="10" border="0" alt="<?php echo $strBrowse . ': ' . $url_title; ?>" /></a><bdo dir="<?php echo $text_dir; ?>">&nbsp;</bdo>
               <a class="tblItem" id="tbl_<?php echo md5($table); ?>" title="<?php echo $url_title; ?>" target="phpmain<?php echo $hash; ?>" href="<?php echo $cfg['DefaultTabTable']; ?>?<?php echo $common_url_query; ?>&amp;table=<?php echo urlencode($table); ?>">
                   <?php echo ($alias != '' && $cfg['ShowTooltipAliasTB'] ? $alias : htmlspecialchars($table)); ?></a></nobr><br />
         <?php
         } else {
-            $list_item = '<a target="phpmain' . $hash . '" href="sql.php3?' . $common_url_query . '&amp;table=' . urlencode($table) . '&amp;sql_query=' . (isset($book_sql_query) && $book_sql_query != FALSE ? urlencode($book_sql_query) : urlencode('SELECT * FROM ' . PMA_backquote($table))) . '&amp;pos=0&amp;goto=' . $cfg['DefaultTabTable'] . '" title="' . $strBrowse . ': ' . $url_title . '">';
+            $list_item = '<a target="phpmain' . $hash . '" href="sql.php?' . $common_url_query . '&amp;table=' . urlencode($table) . '&amp;sql_query=' . (isset($book_sql_query) && $book_sql_query != FALSE ? urlencode($book_sql_query) : urlencode('SELECT * FROM ' . PMA_backquote($table))) . '&amp;pos=0&amp;goto=' . $cfg['DefaultTabTable'] . '" title="' . $strBrowse . ': ' . $url_title . '">';
             $list_item .= '<img src="images/button_smallbrowse.png" width="10" height="10" border="0" alt="' . $strBrowse . ': ' . $url_title . '" /></a>';
             $list_item .= '<bdo dir="' . $text_dir . '">&nbsp;</bdo>' . "\n";
             $list_item .= '<a class="tblItem" id="tbl_' . md5($table) . '" title="' . $url_title . '" target="phpmain' . $hash . '" href="' . $cfg['DefaultTabTable'] . '?' . $common_url_query . '&amp;table=' . urlencode($table) . '">';
diff --git a/libraries/auth/config.auth.lib.php3 b/libraries/auth/config.auth.lib.php
similarity index 100%
rename from libraries/auth/config.auth.lib.php3
rename to libraries/auth/config.auth.lib.php
diff --git a/libraries/auth/cookie.auth.lib.php3 b/libraries/auth/cookie.auth.lib.php
similarity index 98%
rename from libraries/auth/cookie.auth.lib.php3
rename to libraries/auth/cookie.auth.lib.php
index d2f52edc4..83a82ea7f 100644
--- a/libraries/auth/cookie.auth.lib.php3
+++ b/libraries/auth/cookie.auth.lib.php
@@ -28,7 +28,7 @@ if (!defined('PMA_COOKIE_AUTH_INCLUDED')) {
         } // end function
     } // end if
 
-    include('./libraries/blowfish.php3');
+    include('./libraries/blowfish.php');
 
     // Gets the default font sizes
     PMA_setFontSizes();
@@ -234,7 +234,7 @@ input.textfield {font-family: <?php echo $right_font_family; ?>; font-size: <?ph
             echo "\n";
             ?>
 <!-- Language selection -->
-<form method="post" action="index.php3">
+<form method="post" action="index.php">
     <input type="hidden" name="server" value="<?php echo $server; ?>" />
     <b>Language:&nbsp;</b>
     <select name="lang" dir="ltr" onchange="this.form.submit();">
@@ -278,7 +278,7 @@ input.textfield {font-family: <?php echo $right_font_family; ?>; font-size: <?ph
 
 
 <!-- Login form -->
-<form method="post" action="index.php3" name="login_form"<?php echo $autocomplete; ?>>
+<form method="post" action="index.php" name="login_form"<?php echo $autocomplete; ?>>
     <table cellpadding="5">
 <?php if ($GLOBALS['cfg']['AllowArbitraryServer']) { ?>
     <tr>
@@ -606,10 +606,10 @@ if (uname.value == '') {
                 }
             } // end if
             if (!empty($GLOBALS['SERVER_SOFTWARE']) && $GLOBALS['SERVER_SOFTWARE'] == 'Microsoft-IIS/5.0') {
-                header('Refresh: 0; url=' . $cfg['PmaAbsoluteUri'] . 'index.php3?' . PMA_generate_common_url('', '', '&'));
+                header('Refresh: 0; url=' . $cfg['PmaAbsoluteUri'] . 'index.php?' . PMA_generate_common_url('', '', '&'));
             }
             else {
-                header('Location: ' . $cfg['PmaAbsoluteUri'] . 'index.php3?' . PMA_generate_common_url('', '', '&'));
+                header('Location: ' . $cfg['PmaAbsoluteUri'] . 'index.php?' . PMA_generate_common_url('', '', '&'));
             }
             exit();
         } // end if
diff --git a/libraries/auth/http.auth.lib.php3 b/libraries/auth/http.auth.lib.php
similarity index 100%
rename from libraries/auth/http.auth.lib.php3
rename to libraries/auth/http.auth.lib.php
diff --git a/libraries/blowfish.php3 b/libraries/blowfish.php
similarity index 100%
rename from libraries/blowfish.php3
rename to libraries/blowfish.php
diff --git a/libraries/bookmark.lib.php3 b/libraries/bookmark.lib.php
similarity index 98%
rename from libraries/bookmark.lib.php3
rename to libraries/bookmark.lib.php
index efe34fa31..d5a19173c 100644
--- a/libraries/bookmark.lib.php3
+++ b/libraries/bookmark.lib.php
@@ -131,14 +131,14 @@ if (!defined('PMA_BOOKMARK_LIB_INCLUDED')) {
             $result   = PMA_mysql_query($query, $GLOBALS['dbh']);
             if (PMA_mysql_error($GLOBALS['dbh'])) {
                $error = PMA_mysql_error($GLOBALS['dbh']);
-               include('./header.inc.php3');
+               include('./header.inc.php');
                PMA_mysqlDie($error);
             }
         } else {
             $result   = PMA_mysql_query($query);
             if (PMA_mysql_error()) {
                $error = PMA_mysql_error();
-               include('./header.inc.php3');
+               include('./header.inc.php');
                PMA_mysqlDie($error);
             }
         }
diff --git a/libraries/charset_conversion.lib.php3 b/libraries/charset_conversion.lib.php
similarity index 97%
rename from libraries/charset_conversion.lib.php3
rename to libraries/charset_conversion.lib.php
index 959cfb87f..5003ce132 100644
--- a/libraries/charset_conversion.lib.php3
+++ b/libraries/charset_conversion.lib.php
@@ -89,10 +89,10 @@ if (!defined('PMA_CHARSET_CONVERSION_LIB_INCLUDED')){
                 $PMA_recoding_engine = PMA_CHARSET_NONE;
 
                 if (!isset($GLOBALS['is_header_sent'])) {
-                    include('./header.inc.php3');
+                    include('./header.inc.php');
                 }
                 echo $strCantUseRecodeIconv;
-                include('./footer.inc.php3');
+                include('./footer.inc.php');
                 exit();
             }
         } else if ($PMA_recoding_engine == 'recode') {
@@ -102,10 +102,10 @@ if (!defined('PMA_CHARSET_CONVERSION_LIB_INCLUDED')){
                 $PMA_recoding_engine = PMA_CHARSET_NONE;
 
                 if (!isset($GLOBALS['is_header_sent'])) {
-                    include('./header.inc.php3');
+                    include('./header.inc.php');
                 }
                 echo $strCantUseRecodeIconv;
-                include('./footer.inc.php3');
+                include('./footer.inc.php');
                 exit();
             }
         } else {
@@ -119,10 +119,10 @@ if (!defined('PMA_CHARSET_CONVERSION_LIB_INCLUDED')){
                 $PMA_recoding_engine = PMA_CHARSET_NONE;
 
                 if (!isset($GLOBALS['is_header_sent'])) {
-                    include('./header.inc.php3');
+                    include('./header.inc.php');
                 }
                 echo $strCantUseRecodeIconv;
-                include('./footer.inc.php3');
+                include('./footer.inc.php');
                 exit();
             }
         }
diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php
similarity index 96%
rename from libraries/common.lib.php3
rename to libraries/common.lib.php
index e2e27cb2f..74a41411b 100644
--- a/libraries/common.lib.php3
+++ b/libraries/common.lib.php
@@ -11,18 +11,18 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')) {
     define('PMA_COMMON_LIB_INCLUDED', 1);
 
     /**
-     * Order of sections for common.lib.php3:
+     * Order of sections for common.lib.php:
      *
      * in PHP3, functions and constants must be physically defined
      * before they are referenced
      *
-     * some functions need the constants of libraries/defines.lib.php3
-     * and defines_php.lib.php3
+     * some functions need the constants of libraries/defines.lib.php
+     * and defines_php.lib.php
      *
      * the PMA_setFontSizes() function must be before the call to the
-     * libraries/auth/cookie.auth.lib.php3 library
+     * libraries/auth/cookie.auth.lib.php library
      *
-     * the include of libraries/defines.lib.php3 must be after the connection
+     * the include of libraries/defines.lib.php must be after the connection
      * to db to get the MySql version
      *
      * the PMA_sqlAddslashes() function must be before the connection to db
@@ -38,7 +38,7 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')) {
      * ... so the required order is:
      *
      * - parsing of the configuration file
-     * - first load of the libraries/defines_php.lib.php3 library (won't get the
+     * - first load of the libraries/defines_php.lib.php library (won't get the
      *   MySQL release number)
      * - load of mysql extension (if necessary)
      * - definition of PMA_sqlAddslashes()
@@ -49,7 +49,7 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')) {
      * - loading of an authentication library
      * - db connection
      * - authentication work
-     * - second load of the libraries/define.lib.php3 library to get the MySQL
+     * - second load of the libraries/define.lib.php library to get the MySQL
      *   release number)
      * - other functions, respecting dependencies
      */
@@ -75,10 +75,10 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')) {
     /**
      * Detects the config file we want to load
      */
-    if (file_exists('./config.inc.developer.php3')) {
-        $cfgfile_to_load = './config.inc.developer.php3';
+    if (file_exists('./config.inc.developer.php')) {
+        $cfgfile_to_load = './config.inc.developer.php';
     } else {
-        $cfgfile_to_load = './config.inc.php3';
+        $cfgfile_to_load = './config.inc.php';
     }
 
     /**
@@ -93,7 +93,7 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')) {
         $cfg = array('DefaultLang'           => 'en-iso-8859-1',
                         'AllowAnywhereRecoding' => FALSE);
         // Loads the language file
-        include('./libraries/select_lang.lib.php3');
+        include('./libraries/select_lang.lib.php');
         // Sends the Content-Type header
         header('Content-Type: text/html; charset=' . $charset);
         // Displays the error message
@@ -119,7 +119,7 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
 <h1>phpMyAdmin - <?php echo $strError; ?></h1>
 <p>
     <?php echo $strConfigFileError; ?><br /><br />
-    <a href="config.inc.php3" target="_blank">config.inc.php3</a>
+    <a href="config.inc.php" target="_blank">config.inc.php</a>
 </p>
 </body>
 
@@ -132,25 +132,25 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
     unset($cfgfile_to_load);
 
     /**
-     * Includes compatibility code for older config.inc.php3 revisions
+     * Includes compatibility code for older config.inc.php revisions
      * if necessary
      */
     if (!isset($cfg['FileRevision']) || (int) substr($cfg['FileRevision'], 13, 3) < 211) {
-        include('./libraries/config_import.lib.php3');
+        include('./libraries/config_import.lib.php');
     }
 
     /**
      * Includes the language file if it hasn't been included yet
      */
     if (!defined('PMA_SELECT_LANG_LIB_INCLUDED')) {
-        include('./libraries/select_lang.lib.php3');
+        include('./libraries/select_lang.lib.php');
     }
 
     if ($is_minimum_common == FALSE) {
         /**
          * Include MySQL wrappers.
          */
-        include('./libraries/mysql_wrappers.lib.php3');
+        include('./libraries/mysql_wrappers.lib.php');
     }
 
     /**
@@ -158,7 +158,7 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
      * This include must be located physically before any code that needs to
      * reference the constants, else PHP 3.0.16 won't be happy.
      */
-    include('./libraries/defines_php.lib.php3');
+    include('./libraries/defines_php.lib.php');
 
     if ($is_minimum_common == FALSE) {
         /**
@@ -192,7 +192,7 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
         /**
          * Charset conversion.
          */
-        include('./libraries/charset_conversion.lib.php3');
+        include('./libraries/charset_conversion.lib.php');
     }
 
     /**
@@ -202,33 +202,33 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
      * located after we are connected to db to get the MySql version (see
      * below).
      */
-    include('./libraries/defines.lib.php3');
+    include('./libraries/defines.lib.php');
 
     if ($is_minimum_common == FALSE) {
         /**
          * String handling
          */
-        include('./libraries/string.lib.php3');
+        include('./libraries/string.lib.php');
     }
 
     if ($is_minimum_common == FALSE) {
         /**
          * SQL Parser data
          */
-        include('./libraries/sqlparser.data.php3');
+        include('./libraries/sqlparser.data.php');
     }
 
     /**
      * SQL Parser code
      */
 
-    include('./libraries/sqlparser.lib.php3');
+    include('./libraries/sqlparser.lib.php');
 
     if ($is_minimum_common == FALSE) {
         /**
          * SQL Validator interface code
          */
-        include('./libraries/sqlvalidator.lib.php3');
+        include('./libraries/sqlvalidator.lib.php');
     }
 
     // If zlib output compression is set in the php configuration file, no
@@ -251,7 +251,7 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
         /**
          * Include URL/hidden inputs generating.
          */
-        include('./libraries/url_generating.lib.php3');
+        include('./libraries/url_generating.lib.php');
 
 
         /**
@@ -269,7 +269,7 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
         // check whether mysql is available
         if (!@function_exists('mysql_connect')) {
             if (empty($is_header_sent)) {
-                include('./libraries/header_http.inc.php3');
+                include('./libraries/header_http.inc.php');
             }
             echo $strCantLoadMySQL . '<br />' . "\n"
                  . '<a href="./Documentation.html#faqmysql" target="documentation">' . $GLOBALS['strDocu'] . '</a>' . "\n";
@@ -472,7 +472,7 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
             global $cfg, $table, $db, $sql_query;
 
             if (empty($GLOBALS['is_header_sent'])) {
-                include('./header.inc.php3');
+                include('./header.inc.php');
             }
 
             if (!$error_message) {
@@ -508,7 +508,7 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
                 echo '    ' . $GLOBALS['strSQLQuery'] . '&nbsp;:&nbsp;' . "\n";
                 if ($is_modify_link && isset($db)) {
                     echo '    ['
-                            . '<a href="db_details.php3?' . PMA_generate_common_url($GLOBALS['db']) . '&amp;sql_query=' . urlencode($the_query) . '&amp;show_query=1">' . $GLOBALS['strEdit'] . '</a>'
+                            . '<a href="db_details.php?' . PMA_generate_common_url($GLOBALS['db']) . '&amp;sql_query=' . urlencode($the_query) . '&amp;show_query=1">' . $GLOBALS['strEdit'] . '</a>'
                             . ']' . "\n";
                 } // end if
                 echo '</p>' . "\n"
@@ -546,7 +546,7 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
             echo "\n";
 
             if ($exit) {
-                include('./footer.inc.php3');
+                include('./footer.inc.php');
                 exit();
             }
         } // end of the 'PMA_mysqlDie()' function
@@ -728,7 +728,7 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
      * user.
      *
      * This function is based on an article from phpBuilder (see
-     * http://www.phpbuilder.net/columns/tim20000821.php3).
+     * http://www.phpbuilder.net/columns/tim20000821.php).
      *
      * @return  boolean    always true
      *
@@ -820,7 +820,7 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
         $display_pmaAbsoluteUri_warning = 0;
 
         // Olivier: Setup a default value to let the people and lazy syadmins
-        //          work anyway, but display a big warning on the main.php3
+        //          work anyway, but display a big warning on the main.php
         //          page.
         if (empty($cfg['PmaAbsoluteUri'])) {
             if (!empty($_SERVER)) {
@@ -984,7 +984,7 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
             // (for a quick check of path disclosure in auth/cookies:)
             $coming_from_common = TRUE;
 
-            include('./libraries/auth/' . $cfg['Server']['auth_type'] . '.auth.lib.php3');
+            include('./libraries/auth/' . $cfg['Server']['auth_type'] . '.auth.lib.php');
             if (!PMA_auth_check()) {
                 PMA_auth();
             } else {
@@ -998,7 +998,7 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
             // Look at: "static int check_dir_access(request_rec *r)"
             // Robbat2 - May 10, 2002
             if (isset($cfg['Server']['AllowDeny']) && isset($cfg['Server']['AllowDeny']['order'])) {
-                include('./libraries/ip_allow_deny.lib.php3');
+                include('./libraries/ip_allow_deny.lib.php');
 
                 $allowDeny_forbidden         = FALSE; // default
                 if ($cfg['Server']['AllowDeny']['order'] == 'allow,deny') {
@@ -1080,7 +1080,7 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
                                     . (empty($client_flags) ? '' : ', FALSE, ' . $client_flags)
                                     . ')';
                     if (empty($GLOBALS['is_header_sent'])) {
-                        include('./header.inc.php3');
+                        include('./header.inc.php');
                     }
                     //PMA_mysqlDie($conn_error, $local_query, FALSE);
                     PMA_mysqlDie($conn_error, '', FALSE);
@@ -1123,9 +1123,9 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
                 $dbh = $userlink;
             }
 
-            // Runs the "defines.lib.php3" for the second time to get the mysql
+            // Runs the "defines.lib.php" for the second time to get the mysql
             // release number
-            include('./libraries/defines.lib.php3');
+            include('./libraries/defines.lib.php');
 
             // if 'only_db' is set for the current user, there is no need to check for
             // available databases in the "mysql" db
@@ -1334,7 +1334,7 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
         {
             $the_crlf = "\n";
 
-            // The 'PMA_USR_OS' constant is defined in "./libraries/defines.lib.php3"
+            // The 'PMA_USR_OS' constant is defined in "./libraries/defines.lib.php"
             // Win case
             if (PMA_USR_OS == 'Win') {
                 $the_crlf = "\r\n";
@@ -1407,7 +1407,7 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
             // Reloads the navigation frame via JavaScript if required
             if (isset($GLOBALS['reload']) && $GLOBALS['reload']) {
                 echo "\n";
-                $reload_url = './left.php3?' . PMA_generate_common_url((isset($GLOBALS['db']) ? $GLOBALS['db'] : ''), '', '&')
+                $reload_url = './left.php?' . PMA_generate_common_url((isset($GLOBALS['db']) ? $GLOBALS['db'] : ''), '', '&')
                 ?>
     <script type="text/javascript" language="javascript1.2">
     <!--
@@ -1520,8 +1520,8 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
 
                 //if (!isset($GLOBALS['goto'])) {
                     //$edit_target = (isset($GLOBALS['table'])) ? $cfg['DefaultTabTable'] : $cfg['DefaultTabDatabase'];
-                $edit_target = isset($GLOBALS['db']) ? (isset($GLOBALS['table']) ? 'tbl_properties.php3' : 'db_details.php3') : '';
-                //} else if ($GLOBALS['goto'] != 'main.php3') {
+                $edit_target = isset($GLOBALS['db']) ? (isset($GLOBALS['table']) ? 'tbl_properties.php' : 'db_details.php') : '';
+                //} else if ($GLOBALS['goto'] != 'main.php') {
                 //    $edit_target = $GLOBALS['goto'];
                 //} else {
                 //    $edit_target = '';
@@ -1558,7 +1558,7 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
                         $explain_link_validate = '';
                     }
 
-                    $explain_link = '&nbsp;[<a href="sql.php3'
+                    $explain_link = '&nbsp;[<a href="sql.php'
                                   . $url_qpart
                                   . $explain_link_validate
                                   . '&amp;sql_query=';
@@ -1581,7 +1581,7 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
                 // php-code (Mike Beck 2002-05-22)
                 if (isset($cfg['SQLQuery']['ShowAsPHP'])
                     && $cfg['SQLQuery']['ShowAsPHP'] == TRUE) {
-                    $php_link = '&nbsp;[<a href="sql.php3'
+                    $php_link = '&nbsp;[<a href="sql.php'
                               . $url_qpart
                               . '&amp;show_query=1'
                               . '&amp;sql_query=' . urlencode($local_query)
@@ -1595,7 +1595,7 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
                     $php_link .= '</a>]';
 
                     if (isset($GLOBALS['show_as_php']) && $GLOBALS['show_as_php'] == '1') {
-                        $php_link .= '&nbsp;[<a href="sql.php3'
+                        $php_link .= '&nbsp;[<a href="sql.php'
                                   . $url_qpart
                                   . '&amp;show_query=1'
                                   . '&amp;sql_query=' . urlencode($local_query)
@@ -1610,7 +1610,7 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
                     && $cfg['SQLValidator']['use'] == TRUE
                     && isset($cfg['SQLQuery']['Validate'])
                     && $cfg['SQLQuery']['Validate'] == TRUE) {
-                    $validate_link = '&nbsp;[<a href="sql.php3'
+                    $validate_link = '&nbsp;[<a href="sql.php'
                                    . $url_qpart
                                    . '&amp;show_query=1'
                                    . '&amp;sql_query=' . urlencode($local_query)
@@ -1798,7 +1798,7 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
          * If the variables $link and $args ar left empty, an inactive tab is created
          *
          * @param   string  the text to be displayed as link
-         * @param   string  main link file, e.g. "test.php3"
+         * @param   string  main link file, e.g. "test.php"
          * @param   string  link arguments
          * @param   string  link attributes
          * @param   string  include '?' even though no attributes are set. Can be set empty, should be '?'.
@@ -2006,7 +2006,7 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
                 }
             }
             if ($found_error) {
-                include('./libraries/header_meta_style.inc.php3');
+                include('./libraries/header_meta_style.inc.php');
                 echo '</head><body><p>' . $error_message . '</p></body></html>';
                 if ($die) {
                     exit();
@@ -2019,12 +2019,12 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
         if (PMA_PHP_INT_VERSION >= 40006
             && @function_exists('mb_convert_encoding')
             && strpos(' ' . $lang, 'ja-')
-            && file_exists('./libraries/kanji-encoding.lib.php3')) {
-            include('./libraries/kanji-encoding.lib.php3');
+            && file_exists('./libraries/kanji-encoding.lib.php')) {
+            include('./libraries/kanji-encoding.lib.php');
             define('PMA_MULTIBYTE_ENCODING', 1);
         } // end if
 
-        // garvin: moved from read_dump.php3 because this should be used in tbl_replace_fields.php3 as well.
+        // garvin: moved from read_dump.php because this should be used in tbl_replace_fields.php as well.
         if (!function_exists('is_uploaded_file')) {
             /**
              * Emulates the 'is_uploaded_file()' function for old php versions.
diff --git a/libraries/config_import.lib.php3 b/libraries/config_import.lib.php
similarity index 98%
rename from libraries/config_import.lib.php3
rename to libraries/config_import.lib.php
index 6d862f40d..157dd7f0f 100644
--- a/libraries/config_import.lib.php3
+++ b/libraries/config_import.lib.php
@@ -10,7 +10,7 @@
 /**
  * U S A G E
  *
- * After having added a new directive to the config.inc.php3 file, you need to
+ * After having added a new directive to the config.inc.php file, you need to
  * put some backwards compatibility code into this file.
  *
  * This usually looks like this:
@@ -32,16 +32,16 @@
  * }
  *
  * In order to make this file readable for other developers, please try to use
- * the same order of directives here as you do in config.inc.php3.
+ * the same order of directives here as you do in config.inc.php.
  *
- * After having done all this, search libraries/common.lib.php3 for the
+ * After having done all this, search libraries/common.lib.php for the
  * following paragraph (x is an integer):
  *
  * if (!isset($cfg['FileRevision']) || (int) substr($cfg['FileRevision'], 13, 3) < x) {
- *     include('./libraries/config_import.lib.php3');
+ *     include('./libraries/config_import.lib.php');
  * }
  *
- * Finally, set x to the _new_ revision number of config.inc.php3
+ * Finally, set x to the _new_ revision number of config.inc.php
  * (without '1.': 234 instead of 1.234) and you're done!
  */
 if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) {
@@ -487,19 +487,19 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) {
     }
 
     if (!isset($cfg['DefaultTabServer'])) {
-        $cfg['DefaultTabServer'] = 'main.php3';
+        $cfg['DefaultTabServer'] = 'main.php';
     }
 
     if (!isset($cfg['DefaultTabDatabase'])
-        // rabus: config.inc.php3 rev. 1.112 had this default value.
+        // rabus: config.inc.php rev. 1.112 had this default value.
         || $cfg['DefaultTabDatabase'] == 'Structure') {
-        $cfg['DefaultTabDatabase'] = 'db_details_structure.php3';
+        $cfg['DefaultTabDatabase'] = 'db_details_structure.php';
     }
 
     if (!isset($cfg['DefaultTabTable'])
-        // rabus: config.inc.php3 rev. 1.112 had this default value.
+        // rabus: config.inc.php rev. 1.112 had this default value.
         || $cfg['DefaultTabTable'] == 'Structure') {
-        $cfg['DefaultTabTable'] = 'tbl_properties_structure.php3';
+        $cfg['DefaultTabTable'] = 'tbl_properties_structure.php';
     }
 
     if (!isset($cfg['MySQLManualBase'])) {
diff --git a/libraries/db_config.lib.php3 b/libraries/db_config.lib.php
similarity index 100%
rename from libraries/db_config.lib.php3
rename to libraries/db_config.lib.php
diff --git a/libraries/db_table_exists.lib.php3 b/libraries/db_table_exists.lib.php
old mode 100755
new mode 100644
similarity index 76%
rename from libraries/db_table_exists.lib.php3
rename to libraries/db_table_exists.lib.php
index 4896bae60..6331dd752
--- a/libraries/db_table_exists.lib.php3
+++ b/libraries/db_table_exists.lib.php
@@ -14,20 +14,20 @@ if (!isset($is_db) || !$is_db) {
     }
     if (empty($db) || !$is_db) {
         if (!isset($is_transformation_wrapper)) {
-            header('Location: ' . $cfg['PmaAbsoluteUri'] . 'main.php3?' . PMA_generate_common_url('', '', '&') . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1');
+            header('Location: ' . $cfg['PmaAbsoluteUri'] . 'main.php?' . PMA_generate_common_url('', '', '&') . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1');
         }
         exit();
     }
 } // end if (ensures db exists)
 if (!isset($is_table) || !$is_table) {
-    // Not a valid table name -> back to the db_details.php3
+    // Not a valid table name -> back to the db_details.php
     if (!empty($table)) {
         $is_table = @PMA_mysql_query('SHOW TABLES LIKE \'' . PMA_sqlAddslashes($table, TRUE) . '\'');
     }
     if (empty($table)
         || !($is_table && @mysql_numrows($is_table))) {
         if (!isset($is_transformation_wrapper)) {
-            header('Location: ' . $cfg['PmaAbsoluteUri'] . 'db_details.php3?' . PMA_generate_common_url($db, '', '&') . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1');
+            header('Location: ' . $cfg['PmaAbsoluteUri'] . 'db_details.php?' . PMA_generate_common_url($db, '', '&') . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1');
         }
         exit();
     } else if (isset($is_table)) {
diff --git a/libraries/dbg/profiling.php3 b/libraries/dbg/profiling.php
similarity index 100%
rename from libraries/dbg/profiling.php3
rename to libraries/dbg/profiling.php
diff --git a/libraries/dbg/setup.php3 b/libraries/dbg/setup.php
similarity index 100%
rename from libraries/dbg/setup.php3
rename to libraries/dbg/setup.php
diff --git a/libraries/defines.lib.php3 b/libraries/defines.lib.php
similarity index 98%
rename from libraries/defines.lib.php3
rename to libraries/defines.lib.php
index 33f93e10d..a79766dbc 100644
--- a/libraries/defines.lib.php3
+++ b/libraries/defines.lib.php
@@ -49,7 +49,7 @@ if (!defined('PMA_MYSQL_INT_VERSION') && isset($userlink)) {
 
 // Determines platform (OS), browser and version of the user
 // Based on a phpBuilder article:
-//   see http://www.phpbuilder.net/columns/tim20000821.php3
+//   see http://www.phpbuilder.net/columns/tim20000821.php
 if (!defined('PMA_USR_OS')) {
     // loic1 - 2001/25/11: use the new globals arrays defined with
     // php 4.1+
diff --git a/libraries/defines_php.lib.php3 b/libraries/defines_php.lib.php
similarity index 100%
rename from libraries/defines_php.lib.php3
rename to libraries/defines_php.lib.php
diff --git a/libraries/display_export.lib.php3 b/libraries/display_export.lib.php
similarity index 99%
rename from libraries/display_export.lib.php3
rename to libraries/display_export.lib.php
index b41def319..1cd970ffa 100644
--- a/libraries/display_export.lib.php3
+++ b/libraries/display_export.lib.php
@@ -3,7 +3,7 @@
 // vim: expandtab sw=4 ts=4 sts=4:
 
 // Get relations & co. status
-require('./libraries/relation.lib.php3');
+require('./libraries/relation.lib.php');
 $cfgRelation = PMA_getRelationsParam();
 
 function PMA_exportCheckboxCheck($str) {
@@ -19,7 +19,7 @@ function PMA_exportIsActive($what, $val) {
 }
 
 ?>
-<form method="post" action="export.php3" name="dump">
+<form method="post" action="export.php" name="dump">
 <?php
 $hide_structure = false;
 $hide_sql       = false;
diff --git a/libraries/display_tbl.lib.php3 b/libraries/display_tbl.lib.php
similarity index 98%
rename from libraries/display_tbl.lib.php3
rename to libraries/display_tbl.lib.php
index 53c323991..becaea450 100644
--- a/libraries/display_tbl.lib.php3
+++ b/libraries/display_tbl.lib.php
@@ -230,7 +230,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
             } // end if... else...
             ?>
     <td>
-        <form action="sql.php3" method="post">
+        <form action="sql.php" method="post">
             <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
             <input type="hidden" name="sql_query" value="<?php echo $encoded_query; ?>" />
             <input type="hidden" name="pos" value="0" />
@@ -243,7 +243,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
         </form>
     </td>
     <td>
-        <form action="sql.php3" method="post">
+        <form action="sql.php" method="post">
             <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
             <input type="hidden" name="sql_query" value="<?php echo $encoded_query; ?>" />
             <input type="hidden" name="pos" value="<?php echo $pos_prev; ?>" />
@@ -263,7 +263,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
         &nbsp;&nbsp;&nbsp;
     </td>
     <td align="center">
-        <form action="sql.php3" method="post"
+        <form action="sql.php" method="post"
             onsubmit="return (checkFormElementInRange(this, 'session_max_rows', 1) && checkFormElementInRange(this, 'pos', 0, <?php echo $unlim_num_rows - 1; ?>))">
             <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
             <input type="hidden" name="sql_query" value="<?php echo $encoded_query; ?>" />
@@ -310,7 +310,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
             echo "\n";
             ?>
     <td>
-        <form action="sql.php3" method="post">
+        <form action="sql.php" method="post">
             <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
             <input type="hidden" name="sql_query" value="<?php echo $encoded_query; ?>" />
             <input type="hidden" name="pos" value="<?php echo $pos_next; ?>" />
@@ -323,7 +323,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
         </form>
     </td>
     <td>
-        <form action="sql.php3" method="post"
+        <form action="sql.php" method="post"
             onsubmit="return <?php echo (($pos + $session_max_rows < $unlim_num_rows && $num_rows >= $session_max_rows) ? 'true' : 'false'); ?>">
             <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
             <input type="hidden" name="sql_query" value="<?php echo $encoded_query; ?>" />
@@ -353,7 +353,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
             <?php //<form> for keep the form alignment of button < and << ?>
             <form>
             <?php echo $GLOBALS['strPageNumber']; ?>
-                <select name="goToPage" onChange="goToUrl(this, '<?php echo "sql.php3?sql_query=".$encoded_query."&amp;session_max_rows=".$session_max_rows."&amp;disp_direction=".$disp_direction."&amp;repeat_cells=".$repeat_cells."&amp;goto=".$goto."&amp;dontlimitchars=".$dontlimitchars."&amp;".PMA_generate_common_url($db, $table)."&amp;"; ?>')">
+                <select name="goToPage" onChange="goToUrl(this, '<?php echo "sql.php?sql_query=".$encoded_query."&amp;session_max_rows=".$session_max_rows."&amp;disp_direction=".$disp_direction."&amp;repeat_cells=".$repeat_cells."&amp;goto=".$goto."&amp;dontlimitchars=".$dontlimitchars."&amp;".PMA_generate_common_url($db, $table)."&amp;"; ?>')">
 
            <?php
             if ($nbTotalPage < 200) {
@@ -389,7 +389,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
         &nbsp;&nbsp;&nbsp;
     </td>
     <td>
-        <form action="sql.php3" method="post">
+        <form action="sql.php" method="post">
             <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
             <input type="hidden" name="sql_query" value="<?php echo $encoded_query; ?>" />
             <input type="hidden" name="pos" value="0" />
@@ -535,7 +535,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
 <tr>
     <td colspan="<?php echo $span; ?>" align="center">
                     <?php
-                echo '<form action="sql.php3" method="POST">' . "\n";
+                echo '<form action="sql.php" method="POST">' . "\n";
                 echo PMA_generate_common_hidden_inputs($db, $table, 5);
                 echo '<input type="hidden" name="pos" value="' . $pos .  '" />' . "\n";
                 echo '<input type="hidden" name="session_max_rows" value="' . $session_max_rows . '" />' . "\n";
@@ -593,7 +593,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
         // Start of form for multi-rows delete
 
         if ($is_display['del_lnk'] == 'dr') {
-            echo '<form method="post" action="tbl_row_delete.php3" name="rowsDeleteForm">' . "\n";
+            echo '<form method="post" action="tbl_row_delete.php" name="rowsDeleteForm">' . "\n";
             echo PMA_generate_common_hidden_inputs($db, $table, 1);
             echo '<input type="hidden" name="disp_direction" value="' . $disp_direction . '" />' . "\n";
             echo '<input type="hidden" name="repeat_cells"   value="' . $repeat_cells   . '" />' . "\n";
@@ -611,7 +611,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
                       ? ' rowspan="3"'
                       : '';
         }
-        $text_url = 'sql.php3?'
+        $text_url = 'sql.php?'
                   . PMA_generate_common_url($db, $table)
                   . '&amp;sql_query=' . urlencode($sql_query)
                   . '&amp;pos=' . $pos
@@ -700,7 +700,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
         }
 
         if ($GLOBALS['cfgRelation']['commwork'] && $GLOBALS['cfgRelation']['mimework'] && $GLOBALS['cfg']['BrowseMIME']) {
-            require('./libraries/transformations.lib.php3');
+            require('./libraries/transformations.lib.php');
             $GLOBALS['mime_map'] = PMA_getMIME($db, $table);
         }
 
@@ -819,7 +819,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
                     ?>
     <th <?php echo $column_style; ?> <?php if ($disp_direction == 'horizontalflipped') echo 'valign="bottom"'; ?>>
         <?php echo $comments_table_wrap_pre; ?>
-        <a href="sql.php3?<?php echo $url_query; ?>" <?php echo (($disp_direction == 'horizontalflipped' AND $GLOBALS['cfg']['HeaderFlipType'] == 'css') ? 'style="direction: ltr; writing-mode: tb-rl;"' : '') . ' title="' . $GLOBALS['strSort'] . '"'; ?>>
+        <a href="sql.php?<?php echo $url_query; ?>" <?php echo (($disp_direction == 'horizontalflipped' AND $GLOBALS['cfg']['HeaderFlipType'] == 'css') ? 'style="direction: ltr; writing-mode: tb-rl;"' : '') . ' title="' . $GLOBALS['strSort'] . '"'; ?>>
             <?php echo ($disp_direction == 'horizontalflipped'  && $GLOBALS['cfg']['HeaderFlipType'] == 'fake' ? PMA_flipstring(htmlspecialchars($fields_meta[$i]->name), "<br />\n") : htmlspecialchars($fields_meta[$i]->name)); ?> </a><?php echo $order_img . "\n"; ?>
         <?php echo $comments_table_wrap_post; ?>
     </th>
@@ -827,7 +827,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
                 }
                 $vertical_display['desc'][] = '    <th ' . $column_style . '>' . "\n"
                                             . $comments_table_wrap_pre
-                                            . '        <a href="sql.php3?' . $url_query . '">' . "\n"
+                                            . '        <a href="sql.php?' . $url_query . '">' . "\n"
                                             . '            ' . htmlspecialchars($fields_meta[$i]->name) . '</a>' . $order_img . "\n"
                                             . $comments_table_wrap_post
                                             . '    </th>' . "\n";
@@ -1119,14 +1119,14 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
 
                 // 1.2.1 Modify link(s)
                 if ($is_display['edit_lnk'] == 'ur') { // update row case
-//                    $lnk_goto = 'sql.php3'
+//                    $lnk_goto = 'sql.php'
 //                             . '?' . str_replace('&amp;', '&', $url_query)
 //                              . '&sql_query=' . urlencode($sql_query)
-//                              . '&goto=' . (empty($goto) ? 'tbl_properties.php3' : $goto);
+//                              . '&goto=' . (empty($goto) ? 'tbl_properties.php' : $goto);
 // to reduce the length of the URL, because of some browsers limitations:
-                    $lnk_goto = 'sql.php3';
+                    $lnk_goto = 'sql.php';
 
-                    $edit_url = 'tbl_change.php3'
+                    $edit_url = 'tbl_change.php'
                               . '?' . $url_query
                               . '&amp;primary_key=' . $uva_condition
                               . '&amp;sql_query=' . urlencode($sql_query)
@@ -1142,7 +1142,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
                 } // end if (1.2.1)
 
                 if ($table == $GLOBALS['cfg']['Bookmark']['table'] && $db == $GLOBALS['cfg']['Bookmark']['db']) {
-                    $bookmark_go = '<a href="read_dump.php3?'
+                    $bookmark_go = '<a href="read_dump.php?'
                                     . PMA_generate_common_url($row['dbase'], '')
                                     . '&amp;id_bookmark=' . $row['id']
                                     . '&amp;action_bookmark=0'
@@ -1165,13 +1165,13 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
 
                 // 1.2.2 Delete/Kill link(s)
                 if ($is_display['del_lnk'] == 'dr') { // delete row case
-                    $lnk_goto = 'sql.php3'
+                    $lnk_goto = 'sql.php'
                               . '?' . str_replace('&amp;', '&', $url_query)
                               . '&sql_query=' . urlencode($sql_query)
                               . '&zero_rows=' . urlencode(htmlspecialchars($GLOBALS['strDeleted']))
-                              . '&goto=' . (empty($goto) ? 'tbl_properties.php3' : $goto);
+                              . '&goto=' . (empty($goto) ? 'tbl_properties.php' : $goto);
                     $del_query = urlencode('DELETE FROM ' . PMA_backquote($table) . ' WHERE') . $uva_condition . ((PMA_MYSQL_INT_VERSION >= 32207) ? urlencode(' LIMIT 1') : '');
-                    $del_url  = 'sql.php3'
+                    $del_url  = 'sql.php'
                               . '?' . $url_query
                               . '&amp;sql_query=' . $del_query
                               . '&amp;zero_rows=' . urlencode(htmlspecialchars($GLOBALS['strDeleted']))
@@ -1188,11 +1188,11 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
                         }
                     }
                 } else if ($is_display['del_lnk'] == 'kp') { // kill process case
-                    $lnk_goto = 'sql.php3'
+                    $lnk_goto = 'sql.php'
                               . '?' . str_replace('&amp;', '&', $url_query)
                               . '&sql_query=' . urlencode($sql_query)
-                              . '&goto=main.php3';
-                    $del_url  = 'sql.php3?'
+                              . '&goto=main.php';
+                    $del_url  = 'sql.php?'
                               . PMA_generate_common_url('mysql')
                               . '&amp;sql_query=' . urlencode('KILL ' . $row['Id'])
                               . '&amp;goto=' . urlencode($lnk_goto);
@@ -1210,7 +1210,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
                 // 1.3 Displays the links at left if required
                 if ($GLOBALS['cfg']['ModifyDeleteAtLeft']
                     && ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped')) {
-                    include('./libraries/display_tbl_links.lib.php3');
+                    include('./libraries/display_tbl_links.lib.php');
                 } // end if (1.3)
                 echo (($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') ? "\n" : '');
             } // end if (1)
@@ -1242,7 +1242,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
                         // garvin: for security, never allow to break out from transformations directory
                         $include_file = eregi_replace('\.\.*', '.', $GLOBALS['mime_map'][$meta->name]['transformation']);
                         if (file_exists('./libraries/transformations/' . $include_file)) {
-                            $transformfunction_name = str_replace('.inc.php3', '', $GLOBALS['mime_map'][$meta->name]['transformation']);
+                            $transformfunction_name = str_replace('.inc.php', '', $GLOBALS['mime_map'][$meta->name]['transformation']);
 
                             include('./libraries/transformations/' . $include_file);
 
@@ -1321,7 +1321,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
                             } else {
                                 $title = (!empty($dispval))? ' title="' . htmlspecialchars($dispval) . '"' : '';
 
-                                $vertical_display['data'][$row_no][$i] .= '<a href="sql.php3?'
+                                $vertical_display['data'][$row_no][$i] .= '<a href="sql.php?'
                                                                        .  PMA_generate_common_url($map[$meta->name][3], $map[$meta->name][0])
                                                                        .  '&amp;pos=0&amp;session_max_rows=' . $session_max_rows . '&amp;dontlimitchars=' . $dontlimitchars
                                                                        .  '&amp;sql_query=' . urlencode('SELECT * FROM ' . PMA_backquote($map[$meta->name][0]) . ' WHERE ' . PMA_backquote($map[$meta->name][1]) . ' = ' . $row[$pointer]) . '"' . $title . '>'
@@ -1445,7 +1445,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
                             }
                             $title = (!empty($dispval))? ' title="' . htmlspecialchars($dispval) . '"' : '';
 
-                            $vertical_display['data'][$row_no][$i] .= '<a href="sql.php3?'
+                            $vertical_display['data'][$row_no][$i] .= '<a href="sql.php?'
                                                                    .  PMA_generate_common_url($map[$meta->name][3], $map[$meta->name][0])
                                                                    .  '&amp;pos=0&amp;session_max_rows=' . $session_max_rows . '&amp;dontlimitchars=' . $dontlimitchars
                                                                    .  '&amp;sql_query=' . urlencode('SELECT * FROM ' . PMA_backquote($map[$meta->name][0]) . ' WHERE ' . PMA_backquote($map[$meta->name][1]) . ' = \'' . PMA_sqlAddslashes($relation_id) . '\'') . '"' . $title . '>'
@@ -1474,7 +1474,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
             // 3. Displays the modify/delete links on the right if required
             if ($GLOBALS['cfg']['ModifyDeleteAtRight']
                 && ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped')) {
-                    include('./libraries/display_tbl_links.lib.php3');
+                    include('./libraries/display_tbl_links.lib.php');
             } // end if (3)
 
             if ($disp_direction == 'horizontal' || $disp_direction == 'horizontalflipped') {
@@ -1704,7 +1704,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
 
     /**
      * Displays a table of results returned by a sql query.
-     * This function is called by the "sql.php3" script.
+     * This function is called by the "sql.php" script.
      *
      * @param   integer the link id associated to the query which results have
      *                  to be displayed
diff --git a/libraries/display_tbl_links.lib.php3 b/libraries/display_tbl_links.lib.php
similarity index 100%
rename from libraries/display_tbl_links.lib.php3
rename to libraries/display_tbl_links.lib.php
diff --git a/libraries/export/csv.php3 b/libraries/export/csv.php
similarity index 100%
rename from libraries/export/csv.php3
rename to libraries/export/csv.php
diff --git a/libraries/export/latex.php3 b/libraries/export/latex.php
similarity index 100%
rename from libraries/export/latex.php3
rename to libraries/export/latex.php
diff --git a/libraries/export/sql.php3 b/libraries/export/sql.php
similarity index 100%
rename from libraries/export/sql.php3
rename to libraries/export/sql.php
diff --git a/libraries/export/xml.php3 b/libraries/export/xml.php
similarity index 100%
rename from libraries/export/xml.php3
rename to libraries/export/xml.php
diff --git a/libraries/fpdf/font/courier.php3 b/libraries/fpdf/font/courier.php
similarity index 100%
rename from libraries/fpdf/font/courier.php3
rename to libraries/fpdf/font/courier.php
diff --git a/libraries/fpdf/font/helvetica.php3 b/libraries/fpdf/font/helvetica.php
similarity index 100%
rename from libraries/fpdf/font/helvetica.php3
rename to libraries/fpdf/font/helvetica.php
diff --git a/libraries/fpdf/font/helveticab.php3 b/libraries/fpdf/font/helveticab.php
similarity index 100%
rename from libraries/fpdf/font/helveticab.php3
rename to libraries/fpdf/font/helveticab.php
diff --git a/libraries/fpdf/font/helveticabi.php3 b/libraries/fpdf/font/helveticabi.php
similarity index 100%
rename from libraries/fpdf/font/helveticabi.php3
rename to libraries/fpdf/font/helveticabi.php
diff --git a/libraries/fpdf/font/helveticai.php3 b/libraries/fpdf/font/helveticai.php
similarity index 100%
rename from libraries/fpdf/font/helveticai.php3
rename to libraries/fpdf/font/helveticai.php
diff --git a/libraries/fpdf/font/symbol.php3 b/libraries/fpdf/font/symbol.php
similarity index 100%
rename from libraries/fpdf/font/symbol.php3
rename to libraries/fpdf/font/symbol.php
diff --git a/libraries/fpdf/font/tahoma.php3 b/libraries/fpdf/font/tahoma.php
similarity index 100%
rename from libraries/fpdf/font/tahoma.php3
rename to libraries/fpdf/font/tahoma.php
diff --git a/libraries/fpdf/font/tahomab.php3 b/libraries/fpdf/font/tahomab.php
similarity index 100%
rename from libraries/fpdf/font/tahomab.php3
rename to libraries/fpdf/font/tahomab.php
diff --git a/libraries/fpdf/font/times.php3 b/libraries/fpdf/font/times.php
similarity index 100%
rename from libraries/fpdf/font/times.php3
rename to libraries/fpdf/font/times.php
diff --git a/libraries/fpdf/font/timesb.php3 b/libraries/fpdf/font/timesb.php
similarity index 100%
rename from libraries/fpdf/font/timesb.php3
rename to libraries/fpdf/font/timesb.php
diff --git a/libraries/fpdf/font/timesbi.php3 b/libraries/fpdf/font/timesbi.php
similarity index 100%
rename from libraries/fpdf/font/timesbi.php3
rename to libraries/fpdf/font/timesbi.php
diff --git a/libraries/fpdf/font/timesi.php3 b/libraries/fpdf/font/timesi.php
similarity index 100%
rename from libraries/fpdf/font/timesi.php3
rename to libraries/fpdf/font/timesi.php
diff --git a/libraries/fpdf/font/zapfdingbats.php3 b/libraries/fpdf/font/zapfdingbats.php
similarity index 100%
rename from libraries/fpdf/font/zapfdingbats.php3
rename to libraries/fpdf/font/zapfdingbats.php
diff --git a/libraries/fpdf/fpdf.php3 b/libraries/fpdf/fpdf.php
similarity index 99%
rename from libraries/fpdf/fpdf.php3
rename to libraries/fpdf/fpdf.php
index 7e3deb1d8..a9e420df5 100644
--- a/libraries/fpdf/fpdf.php3
+++ b/libraries/fpdf/fpdf.php
@@ -1431,7 +1431,7 @@ class FPDF
                     if ($family == 'times' || $family == 'helvetica') {
                         $file .= strtolower($style);
                     }
-                    $file     .= '.php3';
+                    $file     .= '.php';
                     // loic1: PHP3 compatibility
                     // if (defined('FPDF_FONTPATH')) {
                     //     $file = FPDF_FONTPATH . $file;
@@ -1774,7 +1774,7 @@ class FPDF
             $this->Error('Font already added: ' . $family . ' ' . $style);
         }
         if ($file == '') {
-            $file = str_replace(' ', '', $family) . strtolower($style) . '.php3';
+            $file = str_replace(' ', '', $family) . strtolower($style) . '.php';
         }
         // loic1: PHP3 compatibility
         // if (defined('FPDF_FONTPATH')) {
diff --git a/libraries/get_foreign.lib.php3 b/libraries/get_foreign.lib.php
old mode 100755
new mode 100644
similarity index 100%
rename from libraries/get_foreign.lib.php3
rename to libraries/get_foreign.lib.php
diff --git a/libraries/grab_globals.lib.php3 b/libraries/grab_globals.lib.php
similarity index 100%
rename from libraries/grab_globals.lib.php3
rename to libraries/grab_globals.lib.php
diff --git a/libraries/header_http.inc.php3 b/libraries/header_http.inc.php
similarity index 100%
rename from libraries/header_http.inc.php3
rename to libraries/header_http.inc.php
diff --git a/libraries/header_meta_style.inc.php3 b/libraries/header_meta_style.inc.php
similarity index 94%
rename from libraries/header_meta_style.inc.php3
rename to libraries/header_meta_style.inc.php
index 89d4f13eb..b3c35baef 100644
--- a/libraries/header_meta_style.inc.php3
+++ b/libraries/header_meta_style.inc.php
@@ -28,4 +28,4 @@ if (!empty($GLOBALS['cfg']['PmaAbsoluteUri'])) {
     echo '<base href="' . $GLOBALS['cfg']['PmaAbsoluteUri'] . '" />' . "\n";
 }
 ?>
-<link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : './'; ?>css/phpmyadmin.css.php3?lang=<?php echo $GLOBALS['lang']; ?>&amp;js_frame=right" />
+<link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : './'; ?>css/phpmyadmin.css.php?lang=<?php echo $GLOBALS['lang']; ?>&amp;js_frame=right" />
diff --git a/libraries/ip_allow_deny.lib.php3 b/libraries/ip_allow_deny.lib.php
similarity index 100%
rename from libraries/ip_allow_deny.lib.php3
rename to libraries/ip_allow_deny.lib.php
diff --git a/libraries/kanji-encoding.lib.php3 b/libraries/kanji-encoding.lib.php
similarity index 100%
rename from libraries/kanji-encoding.lib.php3
rename to libraries/kanji-encoding.lib.php
diff --git a/libraries/mysql_charsets.lib.php3 b/libraries/mysql_charsets.lib.php
similarity index 100%
rename from libraries/mysql_charsets.lib.php3
rename to libraries/mysql_charsets.lib.php
diff --git a/libraries/mysql_wrappers.lib.php3 b/libraries/mysql_wrappers.lib.php
similarity index 100%
rename from libraries/mysql_wrappers.lib.php3
rename to libraries/mysql_wrappers.lib.php
diff --git a/libraries/ob.lib.php3 b/libraries/ob.lib.php
similarity index 100%
rename from libraries/ob.lib.php3
rename to libraries/ob.lib.php
diff --git a/libraries/read_dump.lib.php3 b/libraries/read_dump.lib.php
similarity index 100%
rename from libraries/read_dump.lib.php3
rename to libraries/read_dump.lib.php
diff --git a/libraries/relation.lib.php3 b/libraries/relation.lib.php
similarity index 100%
rename from libraries/relation.lib.php3
rename to libraries/relation.lib.php
diff --git a/libraries/relation_cleanup.lib.php3 b/libraries/relation_cleanup.lib.php
similarity index 99%
rename from libraries/relation_cleanup.lib.php3
rename to libraries/relation_cleanup.lib.php
index 0f491ceb7..53a301fbf 100644
--- a/libraries/relation_cleanup.lib.php3
+++ b/libraries/relation_cleanup.lib.php
@@ -10,7 +10,7 @@
 if (!defined('PMA_RELATION_CLEANUP_LIB_INCLUDED')){
     define('PMA_RELATION_CLEANUP_LIB_INCLUDED', 1);
 
-    include('./libraries/relation.lib.php3');
+    include('./libraries/relation.lib.php');
     $cfgRelation = PMA_getRelationsParam();
 
     function PMA_relationsCleanupColumn($db, $table, $column) {
diff --git a/libraries/select_lang.lib.php3 b/libraries/select_lang.lib.php
similarity index 99%
rename from libraries/select_lang.lib.php3
rename to libraries/select_lang.lib.php
index 8d2b192be..28a397029 100644
--- a/libraries/select_lang.lib.php3
+++ b/libraries/select_lang.lib.php
@@ -34,7 +34,7 @@ if (!defined('PMA_SELECT_LANG_LIB_INCLUDED')) {
      *    - the '|' character (it means 'OR');
      *    - the full language name.
      * 3. The second values associated to the key is the name of the file to load
-     *    without the 'inc.php3' extension.
+     *    without the 'inc.php' extension.
      * 4. The last values associated to the key is the language code as defined by
      *    the RFC1766.
      *
@@ -230,7 +230,7 @@ if (!defined('PMA_SELECT_LANG_LIB_INCLUDED')) {
      * Do the work!
      */
 
-    // compatibility with config.inc.php3 <= v1.80
+    // compatibility with config.inc.php <= v1.80
     if (!isset($cfg['Lang']) && isset($cfgLang)) {
         $cfg['Lang']        = $cfgLang;
         unset($cfgLang);
@@ -292,7 +292,7 @@ if (!defined('PMA_SELECT_LANG_LIB_INCLUDED')) {
     }
 
     // 5. Defines the associated filename and load the translation
-    $lang_file = $lang_path . $available_languages[$lang][1] . '.inc.php3';
+    $lang_file = $lang_path . $available_languages[$lang][1] . '.inc.php';
     include('./' . $lang_file);
 
 } // $__PMA_SELECT_LANG_LIB__
diff --git a/libraries/sqlparser.data.php3 b/libraries/sqlparser.data.php
similarity index 100%
rename from libraries/sqlparser.data.php3
rename to libraries/sqlparser.data.php
diff --git a/libraries/sqlparser.lib.php3 b/libraries/sqlparser.lib.php
similarity index 99%
rename from libraries/sqlparser.lib.php3
rename to libraries/sqlparser.lib.php
index 3c3856823..dceee1849 100644
--- a/libraries/sqlparser.lib.php3
+++ b/libraries/sqlparser.lib.php
@@ -25,9 +25,9 @@
  *
  * If you want a pretty-printed version of the query, do:
  * $string = PMA_SQP_formatHtml($parsed_sql);
- * (note that that you need to have syntax.css.php3 included somehow in your
+ * (note that that you need to have syntax.css.php included somehow in your
  * page for it to work, I recommend '<link rel="stylesheet" type="text/css"
- * href="syntax.css.php3" />' at the moment.)
+ * href="syntax.css.php" />' at the moment.)
  */
 
 
@@ -47,14 +47,14 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
          * Include the string library as we use it heavily
          */
         if (!defined('PMA_STR_LIB_INCLUDED')) {
-            include('./libraries/string.lib.php3');
+            include('./libraries/string.lib.php');
         }
 
         /**
          * Include data for the SQL Parser
          */
         if (!defined('PMA_SQP_DATA_INCLUDED')) {
-            include('./libraries/sqlparser.data.php3');
+            include('./libraries/sqlparser.data.php');
         }
 
         if (!defined('DEBUG_TIMING')) {
@@ -1205,7 +1205,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
                // need_confirm
                //
                // check for reserved words that will have to generate
-               // a confirmation request later in sql.php3
+               // a confirmation request later in sql.php
                // the cases are:
                //   DROP TABLE
                //   DROP DATABASE
diff --git a/libraries/sqlvalidator.class.php3 b/libraries/sqlvalidator.class.php
similarity index 100%
rename from libraries/sqlvalidator.class.php3
rename to libraries/sqlvalidator.class.php
diff --git a/libraries/sqlvalidator.lib.php3 b/libraries/sqlvalidator.lib.php
similarity index 98%
rename from libraries/sqlvalidator.lib.php3
rename to libraries/sqlvalidator.lib.php
index 9dbcc29b3..bcaa39ceb 100644
--- a/libraries/sqlvalidator.lib.php3
+++ b/libraries/sqlvalidator.lib.php
@@ -41,7 +41,7 @@ if (!defined('PMA_SQL_VALIDATOR_INCLUDED')) {
     if ($cfg['SQLValidator']['use'] == TRUE)  {
         // We cannot check && !defined(PMA_SQL_VALIDATOR_CLASS_INCLUDED))
         // as it will produce a nasty warning message
-        include('./libraries/sqlvalidator.class.php3');
+        include('./libraries/sqlvalidator.class.php');
     } // if ($cfg['SQLValidator']['use'] == TRUE)
 
 
diff --git a/libraries/string.lib.php3 b/libraries/string.lib.php
similarity index 100%
rename from libraries/string.lib.php3
rename to libraries/string.lib.php
diff --git a/libraries/transformations.lib.php3 b/libraries/transformations.lib.php
similarity index 96%
rename from libraries/transformations.lib.php3
rename to libraries/transformations.lib.php
index 558ba5cce..163eabcb1 100644
--- a/libraries/transformations.lib.php3
+++ b/libraries/transformations.lib.php
@@ -50,9 +50,9 @@ if (!defined('PMA_TRANSFORMATION_LIB_INCLUDED')){
             @reset($filestack);
             while(list($key, $file) = each($filestack)) {
 
-                if (eregi('^.*__.*\.inc\.php3$', trim($file))) {
+                if (eregi('^.*__.*\.inc\.php$', trim($file))) {
                     // File contains transformation functions.
-                    $base = explode("__", str_replace(".inc.php3", "", $file));
+                    $base = explode("__", str_replace(".inc.php", "", $file));
                     
                     $mimetype = str_replace("_", "/", $base[0]);
                     $stack['mimetype'][$mimetype] = $mimetype;
@@ -60,9 +60,9 @@ if (!defined('PMA_TRANSFORMATION_LIB_INCLUDED')){
                     $stack['transformation'][] = $mimetype . ': ' . $base[1];
                     $stack['transformation_file'][] = $file;
 
-                } else if (eregi('^.*\.inc\.php3$', trim($file))) {
+                } else if (eregi('^.*\.inc\.php$', trim($file))) {
                     // File is a plain mimetype, no functions.
-                    $base = str_replace(".inc.php3", "", $file);
+                    $base = str_replace(".inc.php", "", $file);
                     
                     if ($base != 'global') {
                         $mimetype = str_replace("_", "/", $base);
diff --git a/libraries/transformations/TEMPLATE b/libraries/transformations/TEMPLATE
index 7dc2f939d..049ab7a0e 100644
--- a/libraries/transformations/TEMPLATE
+++ b/libraries/transformations/TEMPLATE
@@ -17,7 +17,7 @@ if (!defined('PMA_TRANSFORMATION_[ENTER_FILENAME_HERE]')){
 
     function PMA_transformation_[enter_filename_here]($buffer, $options = array(), $meta = '') {
         // possibly use a global transform and feed it with special options:
-        // include('./libraries/transformations/global.inc.php3');
+        // include('./libraries/transformations/global.inc.php');
 
         // further operations on $buffer using the $options[] array.
 
diff --git a/libraries/transformations/generator.sh b/libraries/transformations/generator.sh
index c5bc15bcc..0d0d6fa7b 100644
--- a/libraries/transformations/generator.sh
+++ b/libraries/transformations/generator.sh
@@ -18,7 +18,7 @@ fi
 functionupper="`echo $2 | tr [:lower:] [:upper:]`"
 functionlower="`echo $2 | tr [:upper:] [:lower:]`"
 
-cat $1 | sed "s/\[ENTER_FILENAME_HERE\]/$functionupper/" | sed "s/\[enter_filename_here\]/$functionlower/" >> $2.inc.php3
+cat $1 | sed "s/\[ENTER_FILENAME_HERE\]/$functionupper/" | sed "s/\[enter_filename_here\]/$functionlower/" >> $2.inc.php
 
 if [ "$3" ]
 then
@@ -29,5 +29,5 @@ then
     echo ""
 fi
 
-echo "Created $2.inc.php3"
+echo "Created $2.inc.php"
 echo ""
diff --git a/libraries/transformations/global.inc.php3 b/libraries/transformations/global.inc.php
similarity index 94%
rename from libraries/transformations/global.inc.php3
rename to libraries/transformations/global.inc.php
index 48fd291b5..5cc18fd5b 100644
--- a/libraries/transformations/global.inc.php3
+++ b/libraries/transformations/global.inc.php
@@ -10,11 +10,11 @@
  *
  * The basic filename usage for any plugin, residing in the libraries/transformations directory is:
  *
- * -- <mime_type>_<mime_subtype>__<transformation_name>.inc.php3
+ * -- <mime_type>_<mime_subtype>__<transformation_name>.inc.php
  *
  * The function name has to be the like above filename:
  *
- * -- function PMA_transformation_<mime_type>_<mime_subtype>__<transformation_name>.inc.php3
+ * -- function PMA_transformation_<mime_type>_<mime_subtype>__<transformation_name>.inc.php
  *
  * Please use short and expressive names. For now, special characters which aren't allowed in
  * filenames or functions should not be used.
diff --git a/libraries/transformations/image_jpeg__inline.inc.php3 b/libraries/transformations/image_jpeg__inline.inc.php
similarity index 52%
rename from libraries/transformations/image_jpeg__inline.inc.php3
rename to libraries/transformations/image_jpeg__inline.inc.php
index bdf0e0a7f..094d34656 100644
--- a/libraries/transformations/image_jpeg__inline.inc.php3
+++ b/libraries/transformations/image_jpeg__inline.inc.php
@@ -6,12 +6,12 @@ if (!defined('PMA_TRANSFORMATION_IMAGE_JPEG__INLINE')){
     define('PMA_TRANSFORMATION_IMAGE_JPEG__INLINE', 1);
 
     function PMA_transformation_image_jpeg__inline($buffer, $options = array(), $meta = '') {
-        include('./libraries/transformations/global.inc.php3');
+        include('./libraries/transformations/global.inc.php');
 
         if (PMA_IS_GD2) {
-            $transform_options = array ('string' => '<a href="transformation_wrapper.php3' . $options['wrapper_link'] . '" target="_blank"><img src="transformation_wrapper.php3' . $options['wrapper_link'] . '&amp;resize=jpeg&amp;newWidth=' . (isset($options[0]) ? $options[0] : '100') . '&amp;newHeight=' . (isset($options[1]) ? $options[1] : 100) . '" alt="[__BUFFER__]" border="0"></a>');
+            $transform_options = array ('string' => '<a href="transformation_wrapper.php' . $options['wrapper_link'] . '" target="_blank"><img src="transformation_wrapper.php' . $options['wrapper_link'] . '&amp;resize=jpeg&amp;newWidth=' . (isset($options[0]) ? $options[0] : '100') . '&amp;newHeight=' . (isset($options[1]) ? $options[1] : 100) . '" alt="[__BUFFER__]" border="0"></a>');
         } else {
-            $transform_options = array ('string' => '<img src="transformation_wrapper.php3' . $options['wrapper_link'] . '" alt="[__BUFFER__]" width="320" height="240">');
+            $transform_options = array ('string' => '<img src="transformation_wrapper.php' . $options['wrapper_link'] . '" alt="[__BUFFER__]" width="320" height="240">');
         }
         $buffer = PMA_transformation_global_html_replace($buffer, $transform_options);
 
diff --git a/libraries/transformations/image_jpeg__link.inc.php3 b/libraries/transformations/image_jpeg__link.inc.php
similarity index 74%
rename from libraries/transformations/image_jpeg__link.inc.php3
rename to libraries/transformations/image_jpeg__link.inc.php
index fdcf3d573..36527c967 100644
--- a/libraries/transformations/image_jpeg__link.inc.php3
+++ b/libraries/transformations/image_jpeg__link.inc.php
@@ -6,9 +6,9 @@ if (!defined('PMA_TRANSFORMATION_IMAGE_JPEG__LINK')){
     define('PMA_TRANSFORMATION_IMAGE_JPEG__LINK', 1);
 
     function PMA_transformation_image_jpeg__link($buffer, $options = array(), $meta = '') {
-        include('./libraries/transformations/global.inc.php3');
+        include('./libraries/transformations/global.inc.php');
 
-        $transform_options = array ('string' => '<a href="transformation_wrapper.php3' . $options['wrapper_link'] . '" alt="[__BUFFER__]">[BLOB]</a>');
+        $transform_options = array ('string' => '<a href="transformation_wrapper.php' . $options['wrapper_link'] . '" alt="[__BUFFER__]">[BLOB]</a>');
         $buffer = PMA_transformation_global_html_replace($buffer, $transform_options);
 
         return $buffer;
diff --git a/libraries/transformations/image_png__inline.inc.php3 b/libraries/transformations/image_png__inline.inc.php
similarity index 52%
rename from libraries/transformations/image_png__inline.inc.php3
rename to libraries/transformations/image_png__inline.inc.php
index 00028c10e..ac83a9486 100644
--- a/libraries/transformations/image_png__inline.inc.php3
+++ b/libraries/transformations/image_png__inline.inc.php
@@ -6,12 +6,12 @@ if (!defined('PMA_TRANSFORMATION_IMAGE_PNG__INLINE')){
     define('PMA_TRANSFORMATION_IMAGE_PNG__INLINE', 1);
 
     function PMA_transformation_image_png__inline($buffer, $options = array(), $meta = '') {
-        include('./libraries/transformations/global.inc.php3');
+        include('./libraries/transformations/global.inc.php');
 
         if (PMA_IS_GD2) {
-            $transform_options = array ('string' => '<a href="transformation_wrapper.php3' . $options['wrapper_link'] . '" target="_blank"><img src="transformation_wrapper.php3' . $options['wrapper_link'] . '&amp;resize=png&amp;newWidth=' . (isset($options[0]) ? $options[0] : '100') . '&amp;newHeight=' . (isset($options[1]) ? $options[1] : 100) . '" alt="[__BUFFER__]" border="0"></a>');
+            $transform_options = array ('string' => '<a href="transformation_wrapper.php' . $options['wrapper_link'] . '" target="_blank"><img src="transformation_wrapper.php' . $options['wrapper_link'] . '&amp;resize=png&amp;newWidth=' . (isset($options[0]) ? $options[0] : '100') . '&amp;newHeight=' . (isset($options[1]) ? $options[1] : 100) . '" alt="[__BUFFER__]" border="0"></a>');
         } else {
-            $transform_options = array ('string' => '<img src="transformation_wrapper.php3' . $options['wrapper_link'] . '" alt="[__BUFFER__]" width="320" height="240">');
+            $transform_options = array ('string' => '<img src="transformation_wrapper.php' . $options['wrapper_link'] . '" alt="[__BUFFER__]" width="320" height="240">');
         }
         $buffer = PMA_transformation_global_html_replace($buffer, $transform_options);
 
diff --git a/libraries/transformations/overview.php3 b/libraries/transformations/overview.php
similarity index 83%
rename from libraries/transformations/overview.php3
rename to libraries/transformations/overview.php
index dfca2f868..c52939807 100644
--- a/libraries/transformations/overview.php3
+++ b/libraries/transformations/overview.php
@@ -17,16 +17,16 @@ define('PMA_DISPLAY_HEADING', 0);
  * Gets some core libraries and displays a top message if required
  */
 if (!defined('PMA_GRAB_GLOBALS_INCLUDED')) {
-    include('./libraries/grab_globals.lib.php3');
+    include('./libraries/grab_globals.lib.php');
 }
 if (!defined('PMA_COMMON_LIB_INCLUDED'))  {
-    include('./libraries/common.lib.php3');
+    include('./libraries/common.lib.php');
 }
 
-require('./header.inc.php3');
+require('./header.inc.php');
 
-require('./libraries/relation.lib.php3');
-require('./libraries/transformations.lib.php3');
+require('./libraries/relation.lib.php');
+require('./libraries/transformations.lib.php');
 $cfgRelation = PMA_getRelationsParam();
 
 $types = PMA_getAvailableMIMEtypes();
@@ -63,7 +63,7 @@ while(list($key, $mimetype) = each($types['mimetype'])) {
 $i = 0;
 while(list($key, $transform) = each($types['transformation'])) {
     $i++;
-    $func = strtolower(str_replace('.inc.php3', '', $types['transformation_file'][$key]));
+    $func = strtolower(str_replace('.inc.php', '', $types['transformation_file'][$key]));
     $desc = 'strTransformation_' . $func;
 ?>
     <tr bgcolor="<?php echo ($i % 2 ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']); ?>">
@@ -79,5 +79,5 @@ while(list($key, $transform) = each($types['transformation'])) {
  * Displays the footer
  */
 echo "\n";
-require('./footer.inc.php3');
+require('./footer.inc.php');
 ?>
diff --git a/libraries/transformations/template_generator.sh b/libraries/transformations/template_generator.sh
index 67923bf3d..084559a51 100644
--- a/libraries/transformations/template_generator.sh
+++ b/libraries/transformations/template_generator.sh
@@ -4,7 +4,7 @@
 # Shell script that adds a new mimetype with transform function.
 #
 # The filename should contain either 'mimetype_subtype' or 'mimetype'.
-# The suffix '.inc.php3' is appended automatically!
+# The suffix '.inc.php' is appended automatically!
 #
 # The 'description' parameter will add a new entry in the language file. Watch out for
 # special escaping.
@@ -22,4 +22,4 @@ fi
 
 ./generator.sh 'TEMPLATE' "$1" "$2"
 echo " "
-echo "New TRANSFORM FUNCTION $1.inc.php3 added."
+echo "New TRANSFORM FUNCTION $1.inc.php added."
diff --git a/libraries/transformations/template_generator_mimetype.sh b/libraries/transformations/template_generator_mimetype.sh
index ee2379c02..edee55f2c 100644
--- a/libraries/transformations/template_generator_mimetype.sh
+++ b/libraries/transformations/template_generator_mimetype.sh
@@ -4,7 +4,7 @@
 # Shell script that adds a new mimetype without transform function.
 #
 # The filename should contain either 'mimetype_subtype' or 'mimetype'.
-# The suffix '.inc.php3' is appended automatically!
+# The suffix '.inc.php' is appended automatically!
 #
 # Example:  template_generator_mimetype.sh 'filename'
 # 
@@ -17,4 +17,4 @@ fi
 
 ./generator.sh 'TEMPLATE_MIMETYPE' "$1"
 echo " "
-echo "New MIMETYPE $1.inc.php3 added."
+echo "New MIMETYPE $1.inc.php added."
diff --git a/libraries/transformations/text_plain__dateformat.inc.php3 b/libraries/transformations/text_plain__dateformat.inc.php
similarity index 100%
rename from libraries/transformations/text_plain__dateformat.inc.php3
rename to libraries/transformations/text_plain__dateformat.inc.php
diff --git a/libraries/transformations/text_plain__external.inc.php3 b/libraries/transformations/text_plain__external.inc.php
similarity index 96%
rename from libraries/transformations/text_plain__external.inc.php3
rename to libraries/transformations/text_plain__external.inc.php
index 7377823fc..e17e877a9 100644
--- a/libraries/transformations/text_plain__external.inc.php3
+++ b/libraries/transformations/text_plain__external.inc.php
@@ -23,7 +23,7 @@ if (!defined('PMA_TRANSFORMATION_TEXT_PLAIN__EXTERNAL')){
 
     function PMA_transformation_text_plain__external($buffer, $options = array(), $meta = '') {
         // possibly use a global transform and feed it with special options:
-        // include('./libraries/transformations/global.inc.php3');
+        // include('./libraries/transformations/global.inc.php');
 
         // further operations on $buffer using the $options[] array.
 
diff --git a/libraries/transformations/text_plain__formatted.inc.php3 b/libraries/transformations/text_plain__formatted.inc.php
similarity index 100%
rename from libraries/transformations/text_plain__formatted.inc.php3
rename to libraries/transformations/text_plain__formatted.inc.php
diff --git a/libraries/transformations/text_plain__imagelink.inc.php3 b/libraries/transformations/text_plain__imagelink.inc.php
similarity index 92%
rename from libraries/transformations/text_plain__imagelink.inc.php3
rename to libraries/transformations/text_plain__imagelink.inc.php
index d468c2d41..1f0edb8de 100644
--- a/libraries/transformations/text_plain__imagelink.inc.php3
+++ b/libraries/transformations/text_plain__imagelink.inc.php
@@ -6,7 +6,7 @@ if (!defined('PMA_TRANSFORMATION_TEXT_PLAIN__IMAGELINK')){
     define('PMA_TRANSFORMATION_TEXT_PLAIN__IMAGELINK', 1);
 
     function PMA_transformation_text_plain__imagelink($buffer, $options = array(), $meta = '') {
-        include('./libraries/transformations/global.inc.php3');
+        include('./libraries/transformations/global.inc.php');
 
         $transform_options = array ('string' => '<a href="' . (isset($options[0]) ? $options[0] : '') . $buffer . '" target="_blank"><img src="' . (isset($options[0]) ? $options[0] : '') . $buffer . '" border="0" width="' . (isset($options[1]) ? $options[1] : 100) . '" height="' . (isset($options[2]) ? $options[2] : 50) . '">' . $buffer . '</a>');
         $buffer = PMA_transformation_global_html_replace($buffer, $transform_options);
diff --git a/libraries/transformations/text_plain__link.inc.php3 b/libraries/transformations/text_plain__link.inc.php
similarity index 92%
rename from libraries/transformations/text_plain__link.inc.php3
rename to libraries/transformations/text_plain__link.inc.php
index 1fbdd7655..6bffeac21 100644
--- a/libraries/transformations/text_plain__link.inc.php3
+++ b/libraries/transformations/text_plain__link.inc.php
@@ -6,7 +6,7 @@ if (!defined('PMA_TRANSFORMATION_TEXT_PLAIN__LINK')){
     define('PMA_TRANSFORMATION_TEXT_PLAIN__LINK', 1);
 
     function PMA_transformation_text_plain__link($buffer, $options = array(), $meta = '') {
-        include('./libraries/transformations/global.inc.php3');
+        include('./libraries/transformations/global.inc.php');
 
 //        $transform_options = array ('string' => '<a href="' . (isset($options[0]) ? $options[0] : '') . '%1$s" title="' . (isset($options[1]) ? $options[1] : '%1$s') . '">' . (isset($options[1]) ? $options[1] : '%1$s') . '</a>');
 
diff --git a/libraries/transformations/text_plain__substr.inc.php3 b/libraries/transformations/text_plain__substr.inc.php
similarity index 95%
rename from libraries/transformations/text_plain__substr.inc.php3
rename to libraries/transformations/text_plain__substr.inc.php
index 56e39eda9..d9245115b 100644
--- a/libraries/transformations/text_plain__substr.inc.php3
+++ b/libraries/transformations/text_plain__substr.inc.php
@@ -7,7 +7,7 @@ if (!defined('PMA_TRANSFORMATION_TEXT_PLAIN__SUBSTR')){
 
     function PMA_transformation_text_plain__substr($buffer, $options = array(), $meta = '') {
         // possibly use a global transform and feed it with special options:
-        // include('./libraries/transformations/global.inc.php3');
+        // include('./libraries/transformations/global.inc.php');
 
         // further operations on $buffer using the $options[] array.
         if (!isset($options[0]) ||  $options[0] == '') {
diff --git a/libraries/url_generating.lib.php3 b/libraries/url_generating.lib.php
similarity index 100%
rename from libraries/url_generating.lib.php3
rename to libraries/url_generating.lib.php
diff --git a/libraries/zip.lib.php3 b/libraries/zip.lib.php
old mode 100755
new mode 100644
similarity index 98%
rename from libraries/zip.lib.php3
rename to libraries/zip.lib.php
index 5918c1fdd..8a8f02905
--- a/libraries/zip.lib.php3
+++ b/libraries/zip.lib.php
@@ -9,10 +9,10 @@
  *
  * Based on :
  *
- *  http://www.zend.com/codex.php3?id=535&single=1
+ *  http://www.zend.com/codex.php?id=535&single=1
  *  By Eric Mueller <eric@themepark.com>
  *
- *  http://www.zend.com/codex.php3?id=470&single=1
+ *  http://www.zend.com/codex.php?id=470&single=1
  *  by Denis125 <webmaster@atlant.ru>
  *
  *  a patch from Peter Listiak <mlady@users.sourceforge.net> for last modified
diff --git a/main.php3 b/main.php
old mode 100755
new mode 100644
similarity index 92%
rename from main.php3
rename to main.php
index 2804aec57..7fb22ed0f
--- a/main.php3
+++ b/main.php
@@ -11,10 +11,10 @@ define('PMA_DISPLAY_HEADING', 0);
  * Gets some core libraries and displays a top message if required
  */
 if (!defined('PMA_GRAB_GLOBALS_INCLUDED')) {
-    include('./libraries/grab_globals.lib.php3');
+    include('./libraries/grab_globals.lib.php');
 }
 if (!defined('PMA_COMMON_LIB_INCLUDED'))  {
-    include('./libraries/common.lib.php3');
+    include('./libraries/common.lib.php');
 }
 // Puts the language to use in a cookie that will expire in 30 days
 if (!isset($pma_uri_parts)) {
@@ -33,7 +33,7 @@ if (isset($table)) {
     unset($table);
 }
 $show_query = '1';
-require('./header.inc.php3');
+require('./header.inc.php');
 if (isset($message)) {
     PMA_showMessage($message);
 }
@@ -43,7 +43,7 @@ else if (isset($reload) && $reload) {
     ?>
 <script type="text/javascript" language="javascript1.2">
 <!--
-window.parent.frames['nav'].location.replace('./left.php3?<?php echo PMA_generate_common_url('', '', '&');?>&hash=' + <?php echo (($cfg['QueryFrame'] && $cfg['QueryFrameJS']) ? 'window.parent.frames[\'queryframe\'].document.hashform.hash.value' : "'" . md5($cfg['PmaAbsoluteUri']) . "'"); ?>););
+window.parent.frames['nav'].location.replace('./left.php?<?php echo PMA_generate_common_url('', '', '&');?>&hash=' + <?php echo (($cfg['QueryFrame'] && $cfg['QueryFrameJS']) ? 'window.parent.frames[\'queryframe\'].document.hashform.hash.value' : "'" . md5($cfg['PmaAbsoluteUri']) . "'"); ?>););
 //-->
 </script>
     <?php
@@ -92,7 +92,7 @@ if ($server > 0) {
  * Reload mysql (flush privileges)
  */
 if (($server > 0) && isset($mode) && ($mode == 'reload')) {
-    $result = PMA_mysql_query('FLUSH PRIVILEGES'); // Debug: or PMA_mysqlDie('', 'FLUSH PRIVILEGES', FALSE, 'main.php3?' . PMA_generate_common_url());
+    $result = PMA_mysql_query('FLUSH PRIVILEGES'); // Debug: or PMA_mysqlDie('', 'FLUSH PRIVILEGES', FALSE, 'main.php?' . PMA_generate_common_url());
     echo '<p><b>';
     if ($result != 0) {
       echo $strMySQLReloaded;
@@ -115,7 +115,7 @@ if ($server == 0 || count($cfg['Servers']) > 1) {
 </tr>
 <tr>
     <td>
-        <form method="post" action="index.php3" target="_parent">
+        <form method="post" action="index.php" target="_parent">
             <select name="server">
     <?php
     echo "\n";
@@ -177,7 +177,7 @@ if ($server == 0 || count($cfg['Servers']) > 1) {
 $is_superuser        = FALSE;
 if ($server > 0) {
     // Get user's global privileges ($dbh and $userlink are links to MySQL
-    // defined in the "common.lib.php3" library)
+    // defined in the "common.lib.php" library)
     $is_create_priv  = FALSE;
     $is_process_priv = TRUE;
     $is_reload_priv  = FALSE;
@@ -306,7 +306,7 @@ if ($server > 0) {
         <tr>
             <td valign="baseline"><img src="<?php echo $item_img; ?>" width="7" height="7" alt="item" /></td>
             <td>
-            <form method="post" action="db_create.php3">
+            <form method="post" action="db_create.php">
                 <?php echo $strCreateNewDatabase . '&nbsp;' . PMA_showMySQLDocu('Reference', 'CREATE_DATABASE'); ?><br />
                 <?php echo PMA_generate_common_hidden_inputs(); ?>
                 <input type="hidden" name="reload" value="1" />
@@ -341,7 +341,7 @@ if ($server > 0) {
         <tr>
             <td valign="baseline"><img src="<?php echo $item_img; ?>" width="7" height="7" alt="item" /></td>
             <td>
-                <a href="./server_status.php3?<?php echo $common_url_query; ?>">
+                <a href="./server_status.php?<?php echo $common_url_query; ?>">
                     <?php echo $strMySQLShowStatus . "\n"; ?>
                 </a>
             </td>
@@ -354,7 +354,7 @@ if ($server > 0) {
         <tr>
             <td valign="baseline"><img src="<?php echo $item_img; ?>" width="7" height="7" alt="item" /></td>
             <td>
-                <a href="./server_variables.php3?<?php echo $common_url_query; ?>">
+                <a href="./server_variables.php?<?php echo $common_url_query; ?>">
                 <?php echo $strMySQLShowVars;?></a>&nbsp;
                 <?php echo PMA_showMySQLDocu('MySQL_Database_Administration', 'SHOW_VARIABLES') . "\n"; ?>
             </td>
@@ -367,7 +367,7 @@ if ($server > 0) {
         <tr>
             <td valign="baseline"><img src="<?php echo $item_img; ?>" width="7" height="7" alt="item" /></td>
             <td>
-                <a href="./server_processlist.php3?<?php echo $common_url_query; ?>">
+                <a href="./server_processlist.php?<?php echo $common_url_query; ?>">
                     <?php echo $strMySQLShowProcess; ?></a>&nbsp;
                 <?php echo PMA_showMySQLDocu('MySQL_Database_Administration', 'SHOW_PROCESSLIST') . "\n"; ?>
             </td>
@@ -380,7 +380,7 @@ if ($server > 0) {
         <tr>
             <td valign="baseline"><img src="<?php echo $item_img; ?>" width="7" height="7" alt="item" /></td>
             <td>
-                <a href="./server_collations.php3?<?php echo $common_url_query; ?>">
+                <a href="./server_collations.php?<?php echo $common_url_query; ?>">
                     <?php echo $strCharsetsAndCollations; ?></a>&nbsp;
             </td>
         </tr>
@@ -393,7 +393,7 @@ if ($server > 0) {
         <tr>
             <td valign="baseline"><img src="<?php echo $item_img; ?>" width="7" height="7" alt="item" /></td>
             <td>
-                <a href="main.php3?<?php echo $common_url_query; ?>&amp;mode=reload">
+                <a href="main.php?<?php echo $common_url_query; ?>&amp;mode=reload">
                     <?php echo $strReloadMySQL; ?></a>&nbsp;
                 <?php echo PMA_showMySQLDocu('MySQL_Database_Administration', 'FLUSH') . "\n"; ?>
             </td>
@@ -407,7 +407,7 @@ if ($server > 0) {
         <tr>
             <td valign="baseline"><img src="<?php echo $item_img; ?>" width="7" height="7" alt="item" /></td>
             <td>
-                <a href="server_privileges.php3?<?php echo $common_url_query; ?>">
+                <a href="server_privileges.php?<?php echo $common_url_query; ?>">
                     <?php echo $strPrivileges; ?></a>&nbsp;
             </td>
         </tr>
@@ -417,14 +417,14 @@ if ($server > 0) {
         <tr>
             <td valign="baseline"><img src="<?php echo $item_img; ?>" width="7" height="7" alt="item" /></td>
             <td>
-                <a href="./server_databases.php3?<?php echo $common_url_query; ?>">
+                <a href="./server_databases.php?<?php echo $common_url_query; ?>">
                     <?php echo $strDatabases; ?></a>
             </td>
         </tr>
         <tr>
             <td valign="baseline"><img src="<?php echo $item_img; ?>" width="7" height="7" alt="item" /></td>
             <td>
-                <a href="./server_export.php3?<?php echo $common_url_query; ?>">
+                <a href="./server_export.php?<?php echo $common_url_query; ?>">
                     <?php echo $strExport; ?></a>
             </td>
         </tr>
@@ -437,7 +437,7 @@ if ($server > 0) {
         <tr>
             <td valign="baseline"><img src="<?php echo $item_img; ?>" width="7" height="7" alt="item" /></td>
             <td>
-                <a href="user_password.php3?<?php echo $common_url_query; ?>">
+                <a href="user_password.php?<?php echo $common_url_query; ?>">
                     <?php echo ($strChangePassword); ?></a>
             </td>
         </tr>
@@ -454,7 +454,7 @@ if ($server > 0) {
         <tr>
             <td valign="baseline"><img src="<?php echo $item_img; ?>" width="7" height="7" alt="item" /></td>
             <td>
-                <a href="index.php3?<?php echo $common_url_query; ?>&amp;old_usr=<?php echo urlencode($PHP_AUTH_USER); ?>" target="_parent">
+                <a href="index.php?<?php echo $common_url_query; ?>&amp;old_usr=<?php echo urlencode($PHP_AUTH_USER); ?>" target="_parent">
                     <b><?php echo $strLogout; ?></b></a>&nbsp;<?php echo $http_logout . "\n"; ?>
             </td>
         </tr>
@@ -492,7 +492,7 @@ if (empty($cfg['Lang'])) {
         <tr>
             <td valign="baseline"><img src="<?php echo $item_img; ?>" width="7" height="7" alt="item" /></td>
             <td nowrap="nowrap">
-                <form method="post" action="index.php3" target="_parent">
+                <form method="post" action="index.php" target="_parent">
                     <input type="hidden" name="convcharset" value="<?php echo $convcharset; ?>" />
                     <input type="hidden" name="server" value="<?php echo $server; ?>" />
                     Language <a href="./translators.html" target="documentation">(*)</a>:
@@ -544,7 +544,7 @@ if (isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding']
         <tr>
             <td valign="baseline"><img src="<?php echo $item_img; ?>" width="7" height="7" alt="item" /></td>
             <td nowrap="nowrap">
-                <form method="post" action="index.php3" target="_parent">
+                <form method="post" action="index.php" target="_parent">
                     <input type="hidden" name="server" value="<?php echo $server; ?>" />
                     <input type="hidden" name="lang" value="<?php echo $lang; ?>" />
                     <?php echo $strMySQLCharset;?>:
@@ -587,7 +587,7 @@ if ($is_superuser || $cfg['ShowPhpInfo']) {
         <tr>
             <td valign="baseline"><img src="<?php echo $item_img; ?>" width="7" height="7" alt="item" /></td>
             <td>
-                <a href="phpinfo.php3?<?php echo PMA_generate_common_url(); ?>" target="_blank"><?php echo $strShowPHPInfo; ?></a>
+                <a href="phpinfo.php?<?php echo PMA_generate_common_url(); ?>" target="_blank"><?php echo $strShowPHPInfo; ?></a>
             </td>
         </tr>
     <?php
@@ -641,5 +641,5 @@ if (PMA_PHP_INT_VERSION == 40203 && @extension_loaded('mbstring')) {
  * Displays the footer
  */
 echo "\n";
-require('./footer.inc.php3');
+require('./footer.inc.php');
 ?>
diff --git a/mult_submits.inc.php3 b/mult_submits.inc.php
similarity index 95%
rename from mult_submits.inc.php3
rename to mult_submits.inc.php
index 2ade81fa3..28e35d537 100644
--- a/mult_submits.inc.php3
+++ b/mult_submits.inc.php
@@ -19,7 +19,7 @@ if (!empty($submit_mult)
         $what         = 'drop_db';
     } else if (!empty($selected_tbl)) {
         if ($submit_mult == $strPrintView) {
-            include('./tbl_printview.php3');
+            include('./tbl_printview.php');
             exit();
         } else {
            $selected = $selected_tbl;
@@ -60,7 +60,7 @@ if (!empty($submit_mult)
         if ($submit_mult == $strDrop) {
             $what     = 'drop_fld';
         } else {
-            include('./tbl_alter.php3');
+            include('./tbl_alter.php');
             exit();
         }
     } else {
@@ -77,13 +77,13 @@ if (!empty($submit_mult) && !empty($what)) {
     $js_to_run = 'functions.js';
     unset($message);
     if (!empty($table)) {
-        include('./tbl_properties_common.php3');
-        $url_query .= '&amp;goto=tbl_properties.php3&amp;back=tbl_properties.php3';
-        include('./tbl_properties_table_info.php3');
+        include('./tbl_properties_common.php');
+        $url_query .= '&amp;goto=tbl_properties.php&amp;back=tbl_properties.php';
+        include('./tbl_properties_table_info.php');
     }
     elseif (!empty($db)) {
-        include('./db_details_common.php3');
-        include('./db_details_db_info.php3');
+        include('./db_details_common.php');
+        include('./db_details_db_info.php');
     }
     // Builds the query
     $full_query     = '';
@@ -168,7 +168,7 @@ if (!empty($submit_mult) && !empty($what)) {
     <?php
     echo"\n";
 
-    include('./footer.inc.php3');
+    include('./footer.inc.php');
     exit();
 } // end if
 
@@ -179,7 +179,7 @@ if (!empty($submit_mult) && !empty($what)) {
 else if ($mult_btn == $strYes) {
 
     if ($query_type == 'drop_db' || $query_type == 'drop_tbl' || $query_type == 'drop_fld') {
-        include('./libraries/relation_cleanup.lib.php3');
+        include('./libraries/relation_cleanup.lib.php');
     }
 
     $sql_query      = '';
@@ -268,7 +268,7 @@ else if ($mult_btn == $strYes) {
         || $query_type == 'analyze_tbl'
         || $query_type == 'check_tbl'
         || $query_type == 'optimize_tbl') {
-        include('./sql.php3');
+        include('./sql.php');
         exit();
     }
 
diff --git a/pdf_pages.php3 b/pdf_pages.php
old mode 100755
new mode 100644
similarity index 96%
rename from pdf_pages.php3
rename to pdf_pages.php
index 4f8f8567f..21c3a6423
--- a/pdf_pages.php3
+++ b/pdf_pages.php
@@ -6,20 +6,20 @@
 /**
  * Gets some core libraries
  */
-require('./libraries/grab_globals.lib.php3');
-require('./libraries/common.lib.php3');
-require('./db_details_common.php3');
+require('./libraries/grab_globals.lib.php');
+require('./libraries/common.lib.php');
+require('./db_details_common.php');
 
 
 /**
  * Settings for relation stuff
  */
-require('./libraries/relation.lib.php3');
+require('./libraries/relation.lib.php');
 $cfgRelation = PMA_getRelationsParam();
 
 
 /**
- * Now in ./libraries/relation.lib.php3 we check for all tables
+ * Now in ./libraries/relation.lib.php we check for all tables
  * that we need, but if we don't find them we are quiet about it
  * so people can work without.
  * This page is absolutely useless if you didn't set up your tables
@@ -27,24 +27,24 @@ $cfgRelation = PMA_getRelationsParam();
  * complain ;-)
  */
 if (!$cfgRelation['relwork']) {
-    echo sprintf($strNotSet, 'relation', 'config.inc.php3') . '<br />' . "\n"
+    echo sprintf($strNotSet, 'relation', 'config.inc.php') . '<br />' . "\n"
          . '<a href="./Documentation.html#relation" target="documentation">' . $strDocu . '</a>' . "\n";
     exit();
 }
 
 if (!$cfgRelation['displaywork']) {
-    echo sprintf($strNotSet, 'table_info', 'config.inc.php3') . '<br />' . "\n"
+    echo sprintf($strNotSet, 'table_info', 'config.inc.php') . '<br />' . "\n"
          . '<a href="./Documentation.html#table_info" target="documentation">' . $strDocu . '</a>' . "\n";
     exit();
 }
 
 if (!isset($cfgRelation['table_coords'])){
-    echo sprintf($strNotSet, 'table_coords', 'config.inc.php3') . '<br />' . "\n"
+    echo sprintf($strNotSet, 'table_coords', 'config.inc.php') . '<br />' . "\n"
          . '<a href="./Documentation.html#table_coords" target="documentation">' . $strDocu . '</a>' . "\n";
     exit();
 }
 if (!isset($cfgRelation['pdf_pages'])) {
-    echo sprintf($strNotSet, 'pdf_page', 'config.inc.php3') . '<br />' . "\n"
+    echo sprintf($strNotSet, 'pdf_page', 'config.inc.php') . '<br />' . "\n"
          . '<a href="./Documentation.html#pdf_pages" target="documentation">' . $strDocu . '</a>' . "\n";
     exit();
 }
@@ -237,7 +237,7 @@ if ($cfgRelation['pdfwork']) {
     $page_rs    = PMA_query_as_cu($page_query);
     if ($page_rs && mysql_num_rows($page_rs) > 0) {
         ?>
-<form method="get" action="pdf_pages.php3" name="selpage">
+<form method="get" action="pdf_pages.php" name="selpage">
     <?php echo $strChoosePage . "\n"; ?>
     <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
     <input type="hidden" name="do" value="choosepage" />
@@ -267,7 +267,7 @@ if ($cfgRelation['pdfwork']) {
 
     // Possibility to create a new page:
     ?>
-<form method="post" action="pdf_pages.php3" name="crpage">
+<form method="post" action="pdf_pages.php" name="crpage">
     <?php echo $strCreatePage . "\n"; ?>
     <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
     <input type="hidden" name="do" value="createpage" />
@@ -304,7 +304,7 @@ reset($array_sh_page);
 if ($cfg['WYSIWYG-PDF']) {
 ?>
 <script type="text/javascript" src="./libraries/dom-drag.js"></script>
-<form method="post" action="pdf_pages.php3" name="dragdrop">
+<form method="post" action="pdf_pages.php" name="dragdrop">
 <input type="button" name="dragdrop" value="<?php echo $strToggleScratchboard; ?>" onclick="ToggleDragDrop('pdflayout');" />
  <input type="button" name="dragdropreset" value="<?php echo $strReset; ?>" onclick="resetDrag();" />
 </form>
@@ -358,7 +358,7 @@ function resetDrag() {
 } // end if WYSIWYG-PDF
 ?>
 
-<form method="post" action="pdf_pages.php3" name="edcoord">
+<form method="post" action="pdf_pages.php" name="edcoord">
     <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
     <input type="hidden" name="chpage" value="<?php echo $chpage; ?>" />
     <input type="hidden" name="do" value="edcoord" />
@@ -459,7 +459,7 @@ function resetDrag() {
             }
         }
         if ($shoot) {
-            echo '<FORM action="pdf_pages.php3" method="post">' . "\n"
+            echo '<FORM action="pdf_pages.php" method="post">' . "\n"
                . PMA_generate_common_hidden_inputs($db, $table)
                . '<input type="hidden" name="do" value="deleteCrap">' . "\n"
                . '<input type="hidden" name="chpage" value="' . $chpage . '">' . "\n"
@@ -481,7 +481,7 @@ function resetDrag() {
        || ($do == 'choosepage' && isset($chpage))
        || ($do == 'createpage' && isset($chpage)))) {
         ?>
-<form method="post" action="pdf_schema.php3" name="pdfoptions">
+<form method="post" action="pdf_schema.php" name="pdfoptions">
     <?php echo PMA_generate_common_hidden_inputs($db); ?>
     <input type="hidden" name="pdf_page_number" value="<?php echo $chpage; ?>" />
     <?php echo $strDisplayPDF; ?>&nbsp;:<br />
@@ -532,5 +532,5 @@ ToggleDragDrop('pdflayout');
  * Displays the footer
  */
 echo "\n";
-require('./footer.inc.php3');
+require('./footer.inc.php');
 ?>
diff --git a/pdf_schema.php3 b/pdf_schema.php
similarity index 98%
rename from pdf_schema.php3
rename to pdf_schema.php
index 65b0c2730..fc97f0f33 100644
--- a/pdf_schema.php3
+++ b/pdf_schema.php
@@ -11,21 +11,21 @@
 /**
  * Gets some core scripts
  */
-require('./libraries/grab_globals.lib.php3');
-require('./libraries/common.lib.php3');
+require('./libraries/grab_globals.lib.php');
+require('./libraries/common.lib.php');
 
 
 /**
  * Settings for relation stuff
  */
-require('./libraries/relation.lib.php3');
-require('./libraries/transformations.lib.php3');
+require('./libraries/relation.lib.php');
+require('./libraries/transformations.lib.php');
 
 $cfgRelation = PMA_getRelationsParam();
 
 
 /**
- * Now in ./libraries/relation.lib.php3 we check for all tables
+ * Now in ./libraries/relation.lib.php we check for all tables
  * that we need, but if we don't find them we are quiet about it
  * so people can work without.
  * This page is absolutely useless if you didn't set up your tables
@@ -34,7 +34,7 @@ $cfgRelation = PMA_getRelationsParam();
  */
 if (!$cfgRelation['pdfwork']) {
     echo '<font color="red">' . $strError . '</font><br />' . "\n";
-    $url_to_goto = '<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php3?' . $url_query . '">';
+    $url_to_goto = '<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $url_query . '">';
     echo sprintf($strRelationNotWorking, $url_to_goto, '</a>') . "\n";
 }
 
@@ -42,7 +42,7 @@ if (!$cfgRelation['pdfwork']) {
 /**
  * Gets the "fpdf" libraries and defines the pdf font path
  */
-require('./libraries/fpdf/fpdf.php3');
+require('./libraries/fpdf/fpdf.php');
 // loic1: PHP3 compatibility
 // define('FPDF_FONTPATH', './libraries/fpdf/font/');
 $FPDF_font_path = './libraries/fpdf/font/';
@@ -290,7 +290,7 @@ class PMA_PDF extends FPDF
         global $server, $lang, $convcharset, $db;
         global $charset, $text_dir, $strRunning, $strDatabase;
 
-        include('./header.inc.php3');
+        include('./header.inc.php');
 
         echo '<p><b>PDF - '. $GLOBALS['strError'] . '</b></p>' . "\n";
         if (!empty($error_message)) {
@@ -300,11 +300,11 @@ class PMA_PDF extends FPDF
         echo '    ' . $error_message . "\n";
         echo '</p>' . "\n";
 
-        echo '<a href="db_details_structure.php3?' . PMA_generate_common_url($db)
+        echo '<a href="db_details_structure.php?' . PMA_generate_common_url($db)
              . '">' . $GLOBALS['strBack'] . '</a>';
         echo "\n";
 
-        include('./footer.inc.php3');
+        include('./footer.inc.php');
         exit();
     } // end of the "PMA_PDF_die()" function
 
@@ -1122,8 +1122,8 @@ class PMA_RT
          // fonts added to phpMyAdmin and considered non-standard by fpdf
          // (Note: those tahoma fonts are iso-8859-2 based)
          if ($this->ff == 'tahoma') {
-             $pdf->AddFont('tahoma','','tahoma.php3');
-             $pdf->AddFont('tahoma','B','tahomab.php3');
+             $pdf->AddFont('tahoma','','tahoma.php');
+             $pdf->AddFont('tahoma','B','tahomab.php');
          }
 
         $pdf->SetFont($this->ff, '', 14);
diff --git a/phpinfo.php3 b/phpinfo.php
similarity index 75%
rename from phpinfo.php3
rename to phpinfo.php
index 39b2d50eb..29f0ea690 100644
--- a/phpinfo.php3
+++ b/phpinfo.php
@@ -6,8 +6,8 @@
 /**
  * Gets core libraries and defines some variables
  */
-require('./libraries/grab_globals.lib.php3');
-require('./libraries/common.lib.php3');
+require('./libraries/grab_globals.lib.php');
+require('./libraries/common.lib.php');
 
 
 /**
diff --git a/queryframe.php3 b/queryframe.php
similarity index 86%
rename from queryframe.php3
rename to queryframe.php
index a9d14d0c8..293b42ae1 100644
--- a/queryframe.php3
+++ b/queryframe.php
@@ -7,7 +7,7 @@
  * Gets the variables sent to this script, retains the db name that may have
  * been defined as startup option and include a core library
  */
-require('./libraries/grab_globals.lib.php3');
+require('./libraries/grab_globals.lib.php');
 if (!empty($db)) {
     $db_start = $db;
 }
@@ -16,8 +16,8 @@ if (!empty($db)) {
 /**
  * Gets a core script and starts output buffering work
  */
-require('./libraries/common.lib.php3');
-require('./libraries/ob.lib.php3');
+require('./libraries/common.lib.php');
+require('./libraries/ob.lib.php');
 if ($cfg['OBGzip']) {
     $ob_mode = PMA_outBufferModeGet();
     if ($ob_mode) {
@@ -26,10 +26,10 @@ if ($cfg['OBGzip']) {
 }
 
 // garvin: For re-usability, moved http-headers
-// to a seperate file. It can now be included by header.inc.php3,
-// queryframe.php3, querywindow.php3.
+// to a seperate file. It can now be included by header.inc.php,
+// queryframe.php, querywindow.php.
 
-include('./libraries/header_http.inc.php3');
+include('./libraries/header_http.inc.php');
 
 /**
  * Displays the frame
@@ -45,7 +45,7 @@ PMA_setFontSizes();
     <title>phpMyAdmin</title>
     <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" />
     <base<?php if (!empty($cfg['PmaAbsoluteUri'])) echo ' href="' . $cfg['PmaAbsoluteUri'] . '"'; ?> />
-    <link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php3?lang=<?php echo $lang; ?>&amp;js_frame=left&num_dbs=0" />
+    <link rel="stylesheet" type="text/css" href="./css/phpmyadmin.css.php?lang=<?php echo $lang; ?>&amp;js_frame=left&num_dbs=0" />
 <?php
 if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
 ?>
@@ -77,14 +77,14 @@ function open_querywindow(url) {
 </head>
 
 <body bgcolor="<?php echo $cfg['LeftBgColor']; ?>" style="margin-left: 0px; margin-top: 5px; margin-right: 0px; margin-bottom: 0px">
-<form name="queryframeform" action="queryframe.php3" method="get">
+<form name="queryframeform" action="queryframe.php" method="get">
 <input type="hidden" name="db" value="" />
 <input type="hidden" name="table" value="" />
 <input type="hidden" name="framename" value="queryframe" />
 </form>
 
 <?php
-$anchor = 'querywindow.php3?' . PMA_generate_common_url('', '');
+$anchor = 'querywindow.php?' . PMA_generate_common_url('', '');
 if ($cfg['QueryFrameJS']) {
     $href = $anchor;
     $target = '';
@@ -104,7 +104,7 @@ document.writeln('<a href="<?php echo $href; ?>" <?php echo $target . ' ' . $onc
 </noscript>
 </center>
 
-<form name="hashform" action="queryframe.php3">
+<form name="hashform" action="queryframe.php">
     <input type="hidden" name="hash" value="<?php echo $hash; ?>">
 </form>
 </body>
diff --git a/querywindow.php3 b/querywindow.php
similarity index 96%
rename from querywindow.php3
rename to querywindow.php
index 2aea8d3a5..2fa872eef 100644
--- a/querywindow.php3
+++ b/querywindow.php
@@ -7,7 +7,7 @@
  * Gets the variables sent to this script, retains the db name that may have
  * been defined as startup option and include a core library
  */
-require('./libraries/grab_globals.lib.php3');
+require('./libraries/grab_globals.lib.php');
 if (!empty($db)) {
     $db_start = $db;
 }
@@ -16,8 +16,8 @@ if (!empty($db)) {
 /**
  * Gets a core script and starts output buffering work
  */
-require('./libraries/common.lib.php3');
-require('./libraries/ob.lib.php3');
+require('./libraries/common.lib.php');
+require('./libraries/ob.lib.php');
 if ($cfg['OBGzip']) {
     $ob_mode = PMA_outBufferModeGet();
     if ($ob_mode) {
@@ -25,7 +25,7 @@ if ($cfg['OBGzip']) {
     }
 }
 
-require('./libraries/relation.lib.php3');
+require('./libraries/relation.lib.php');
 $cfgRelation = PMA_getRelationsParam();
 
 /**
@@ -34,17 +34,17 @@ $cfgRelation = PMA_getRelationsParam();
  * before the user choose among available ones at the welcome screen.
  */
 if ($server > 0) {
-    PMA_availableDatabases(); // this function is defined in "common.lib.php3"
+    PMA_availableDatabases(); // this function is defined in "common.lib.php"
 } else {
     $num_dbs = 0;
 }
 
 // garvin: For re-usability, moved http-headers and stylesheets
-// to a seperate file. It can now be included by header.inc.php3,
-// queryframe.php3, querywindow.php3.
+// to a seperate file. It can now be included by header.inc.php,
+// queryframe.php, querywindow.php.
 
-include('./libraries/header_http.inc.php3');
-include('./libraries/header_meta_style.inc.php3');
+include('./libraries/header_http.inc.php');
+include('./libraries/header_meta_style.inc.php');
 ?>
 
 <script type="text/javascript" language="javascript">    
@@ -221,9 +221,9 @@ if (!isset($goto)) {
     $goto = '';
 }
 
-require './libraries/bookmark.lib.php3';
+require './libraries/bookmark.lib.php';
 $is_inside_querywindow = TRUE;
-require './tbl_query_box.php3';
+require './tbl_query_box.php';
 
 // Hidden forms and query frame interaction stuff
 if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
@@ -243,7 +243,7 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
     <?php
     }
 ?>
-<form action="querywindow.php3" method="post" name="querywindow">
+<form action="querywindow.php" method="post" name="querywindow">
 <?php 
     echo PMA_generate_common_hidden_inputs('', '');
     if (count($input_query_history) > 0) {
diff --git a/read_dump.php3 b/read_dump.php
similarity index 93%
rename from read_dump.php3
rename to read_dump.php
index cb52db7c4..cd20a51b6 100644
--- a/read_dump.php3
+++ b/read_dump.php
@@ -5,9 +5,9 @@
 /**
  * Gets some core libraries
  */
-require('./libraries/read_dump.lib.php3');
-require('./libraries/grab_globals.lib.php3');
-require('./libraries/common.lib.php3');
+require('./libraries/read_dump.lib.php');
+require('./libraries/grab_globals.lib.php');
+require('./libraries/common.lib.php');
 
 if (!isset($db)) {
     $db = '';
@@ -22,12 +22,12 @@ if (!isset($db)) {
 /**
  * Defines the url to return to in case of error in a sql statement
  */
-if (!isset($goto) || !eregi('^(db_details|tbl_properties)(_[a-z]*)?\.php3$', $goto)) {
-    $goto = 'db_details.php3';
+if (!isset($goto) || !eregi('^(db_details|tbl_properties)(_[a-z]*)?\.php$', $goto)) {
+    $goto = 'db_details.php';
 }
 $err_url  = $goto
           . '?' . PMA_generate_common_url($db)
-          . (eregi('^tbl_properties(_[a-z]*)?\.php3$', $goto) ? '&amp;table=' . urlencode($table) : '');
+          . (eregi('^tbl_properties(_[a-z]*)?\.php$', $goto) ? '&amp;table=' . urlencode($table) : '');
 
 
 /**
@@ -49,7 +49,7 @@ if (!empty($sql_localfile) && !empty($cfg['UploadDir'])) {
  * Bookmark Support: get a query back from bookmark if required
  */
 if (!empty($id_bookmark)) {
-    include('./libraries/bookmark.lib.php3');
+    include('./libraries/bookmark.lib.php');
     switch ($action_bookmark) {
         case 0: // bookmarked query that have to be run
             $sql_query = PMA_queryBookmarks($db, $cfg['Bookmark'], $id_bookmark);
@@ -161,7 +161,7 @@ if (!$cfg['AllowUserDropDatabase']
     // loic1: optimized query
     $result = @PMA_mysql_query('USE mysql');
     if (PMA_mysql_error()) {
-        include('./header.inc.php3');
+        include('./header.inc.php');
         PMA_mysqlDie($strNoDropDatabases, '', '', $err_url);
     }
 }
@@ -171,7 +171,7 @@ define('PMA_CHK_DROP', 1);
  * Store a query as a bookmark before executing it?
  */
 if (isset($SQLbookmark) && $sql_query != '') {
-    include('./libraries/bookmark.lib.php3');
+    include('./libraries/bookmark.lib.php');
     $bfields = array(
                  'dbase' => $db,
                  'user'  => $cfg['Bookmark']['user'],
@@ -194,7 +194,7 @@ if ($sql_query != '') {
     }
     
     // Copy of the cleaned sql statement for display purpose only (see near the
-    // beginning of "db_details.php3" & "tbl_properties.php3")
+    // beginning of "db_details.php" & "tbl_properties.php")
 
     // You can either
     // * specify the amount of maximum pieces per query (having max_*_length set to 0!) or
@@ -202,7 +202,7 @@ if ($sql_query != '') {
     // - max_nofile_* is used for any queries submitted via copy&paste in the textarea
     // - max_file_*   is used for any file-submitted query
     if (!$cfg['VerboseMultiSubmit']) {
-        // Here be the values if the Verbose-Mode (see config.inc.php3) is NOT activated
+        // Here be the values if the Verbose-Mode (see config.inc.php) is NOT activated
         $max_nofile_length = 500;
         $max_nofile_pieces = 0;
         // Nijel: Here must be some limit, as extended inserts can be really
@@ -250,7 +250,7 @@ if ($sql_query != '') {
             if (eregi('^(DROP|CREATE)[[:space:]]+(IF EXISTS[[:space:]]+)?(TABLE|DATABASE)[[:space:]]+(.+)', $sql_query)) {
                 $reload = 1;
             }
-            include('./sql.php3');
+            include('./sql.php');
             exit();
         }
 
@@ -266,7 +266,7 @@ if ($sql_query != '') {
                     $complete_query = $sql_query;
                     $display_query = $sql_query;
                     $sql_query = $a_sql_query;
-                    include('./sql.php3');
+                    include('./sql.php');
                     exit();
                 }
 
@@ -331,7 +331,7 @@ if ($sql_query != '') {
  */
 if (isset($my_die)) {
     $js_to_run = 'functions.js';
-    include('./header.inc.php3');
+    include('./header.inc.php');
     if (is_array($my_die)) {
         while(list($key, $die_string) = each($my_die)) {
             PMA_mysqlDie('', $die_string, '', $err_url, FALSE);
@@ -355,28 +355,28 @@ if (isset($db) && $db == '') {
 }
 
 $is_db = $is_table = FALSE;
-if ($goto == 'tbl_properties.php3') {
+if ($goto == 'tbl_properties.php') {
     if (!isset($table)) {
-        $goto     = 'db_details.php3';
+        $goto     = 'db_details.php';
     } else {
         PMA_mysql_select_db($db);
         $is_table = @PMA_mysql_query('SHOW TABLES LIKE \'' . PMA_sqlAddslashes($table, TRUE) . '\'');
         if (!($is_table && @mysql_numrows($is_table))) {
-            $goto = 'db_details.php3';
+            $goto = 'db_details.php';
             unset($table);
         }
     } // end if... else...
 }
-if ($goto == 'db_details.php3') {
+if ($goto == 'db_details.php') {
     if (isset($table)) {
         unset($table);
     }
     if (!isset($db)) {
-        $goto     = 'main.php3';
+        $goto     = 'main.php';
     } else {
         $is_db    = @PMA_mysql_select_db($db);
         if (!$is_db) {
-            $goto = 'main.php3';
+            $goto = 'main.php';
             unset($db);
         }
     } // end if... else...
@@ -394,11 +394,11 @@ if (!empty($id_bookmark) && $action_bookmark == 2) {
     $message   = $strSuccess;
 }
 // Loads to target script
-if ($goto == 'db_details.php3' || $goto == 'tbl_properties.php3') {
+if ($goto == 'db_details.php' || $goto == 'tbl_properties.php') {
     $js_to_run = 'functions.js';
 }
-if ($goto != 'main.php3') {
-    include('./header.inc.php3');
+if ($goto != 'main.php') {
+    include('./header.inc.php');
 }
 $active_page = $goto;
 require('./' . $goto);
diff --git a/scripts/check_lang.php3 b/scripts/check_lang.php
similarity index 97%
rename from scripts/check_lang.php3
rename to scripts/check_lang.php
index 0076075e3..d89151cea 100644
--- a/scripts/check_lang.php3
+++ b/scripts/check_lang.php
@@ -13,7 +13,7 @@ $passed = array();
 // 1. Do check
 $languageDirectory = dir('../lang');
 while ($name = $languageDirectory->read()) {
-    if (strpos($name, '.inc.php3')) {
+    if (strpos($name, '.inc.php')) {
         // 1.1 Checks parse errors and extra blank line
         include('../lang/' . $name);
         header('X-Ping: pong');
diff --git a/scripts/create-release.sh b/scripts/create-release.sh
index 82c7eefc0..c98b37d5d 100755
--- a/scripts/create-release.sh
+++ b/scripts/create-release.sh
@@ -2,9 +2,13 @@
 #
 # $Id$
 #
+# 2003-11-18, nijel@users.sourceforge.net:
+# - switch php3 -> php
+#
 # 2003-10-10, nijel@users.sourceforge.net:
 # - cvsserver set on just one place to ease testing
 # - echoes md5 sums to include on download page
+#
 # 2003-06-22, robbat2@users.sourceforge.net:
 # - Moved to using updatedocs.sh for updating documentation
 # - Make tarring faster by re-arranging ops
@@ -60,7 +64,7 @@ cat <<END
 
 Please ensure you have:
   1. incremented rc count or version in CVS :
-     - in libraries/defines_php.lib.php3 the line
+     - in libraries/defines_php.lib.php the line
           " define('PMA_VERSION', '$1'); "
      - in Documentation.html the 2 lines
           " <title>phpMyAdmin $1 - Documentation</title> "
@@ -73,7 +77,7 @@ Please ensure you have:
        cd lang
        ./sync_lang.sh
      and checked all language files are valid (use
-     the "./scripts/check_lang.php3" script to do it).
+     the "./scripts/check_lang.php" script to do it).
 
 Continue (y/n)?
 END
@@ -112,21 +116,12 @@ find phpMyAdmin -type f -print0 | xargs -0 chmod 644
 find phpMyAdmin \( -name '*.sh' -o -name '*.pl' \) -print0 | xargs -0 chmod 755
 mv phpMyAdmin phpMyAdmin-$1
 
-# Roll up '.php3' release
-zip -9 -r phpMyAdmin-$1-php3.zip phpMyAdmin-$1
-tar cvf phpMyAdmin-$1-php3.tar phpMyAdmin-$1
-bzip2 -9kv phpMyAdmin-$1-php3.tar
-gzip -9v phpMyAdmin-$1-php3.tar
-
-# Setup for '.php' release
-cd phpMyAdmin-$1
-./scripts/extchg.sh php3 php
-cd ..
 # Roll up '.php' release
-zip -9 -r phpMyAdmin-$1-php.zip phpMyAdmin-$1
-tar cvf phpMyAdmin-$1-php.tar phpMyAdmin-$1
-bzip2 -9kv phpMyAdmin-$1-php.tar
-gzip -9v phpMyAdmin-$1-php.tar
+zip -9 -r phpMyAdmin-$1.zip phpMyAdmin-$1
+tar cvf phpMyAdmin-$1.tar phpMyAdmin-$1
+bzip2 -9kv phpMyAdmin-$1.tar
+gzip -9v phpMyAdmin-$1.tar
+
 
 echo ""
 echo ""
@@ -177,7 +172,7 @@ Todo now:
         phpmyadmin-news@lists.sourceforge.net
         phpmyadmin-users@lists.sourceforge.net
  8. increment rc count or version in CVS :
-        - in libraries/defines_php.lib.php3 the line
+        - in libraries/defines_php.lib.php the line
               " define('PHPMYADMIN_VERSION', '2.2.2-rc1'); "
         - in Documentation.html the 2 lines
               " <title>phpMyAdmin 2.2.2-rc1 - Documentation</title> "
diff --git a/scripts/create_tables.sql b/scripts/create_tables.sql
index fb984f4c6..7c2fa5c9f 100644
--- a/scripts/create_tables.sql
+++ b/scripts/create_tables.sql
@@ -9,7 +9,7 @@
 --  up with having the same password for the controluser) #
 --                                                        #
 --  Please dont forget to set up the tablenames in        #
---  config.inc.php3                                       #
+--  config.inc.php                                        #
 --                                                        #
 --  Please note that the table names might be converted   #
 --  to lower case, if the MySQL option                    #
diff --git a/scripts/decode_bug.php3 b/scripts/decode_bug.php
similarity index 98%
rename from scripts/decode_bug.php3
rename to scripts/decode_bug.php
index 1ae0332eb..8c818faa3 100644
--- a/scripts/decode_bug.php3
+++ b/scripts/decode_bug.php
@@ -45,7 +45,7 @@
 <h1>Parser BUG decoder</h1>
 <br />
 
-<form method="post" action="./decode_bug.php3">
+<form method="post" action="./decode_bug.php">
     <input type="hidden" name="bar" value="<?php echo rand(); ?>" />
     Encoded bug report:<br />
     <textarea name="bug_encoded" cols="72" rows="10"></textarea>
diff --git a/server_collations.php3 b/server_collations.php
similarity index 94%
rename from server_collations.php3
rename to server_collations.php
index 10a5dedc9..fe4a7afda 100644
--- a/server_collations.php3
+++ b/server_collations.php
@@ -6,13 +6,13 @@
 /**
  * Does the common work
  */
-require('./server_common.inc.php3');
+require('./server_common.inc.php');
 
 
 /**
  * Displays the links
  */
-require('./server_links.inc.php3');
+require('./server_links.inc.php');
 
 
 /**
@@ -28,7 +28,7 @@ echo '<h2>' . "\n"
  */
 if (PMA_MYSQL_INT_VERSION < 40100) {
     // TODO: Some nice Message :-)
-    include('./footer.inc.php3');
+    include('./footer.inc.php');
     exit;
 }
 
@@ -36,7 +36,7 @@ if (PMA_MYSQL_INT_VERSION < 40100) {
 /**
  * Includes the required charset library
  */
-require('./libraries/mysql_charsets.lib.php3');
+require('./libraries/mysql_charsets.lib.php');
 
 
 /**
@@ -104,6 +104,6 @@ echo '            </table>' . "\n"
    . '    </tr>' . "\n"
    . '</table>' . "\n";
 
-require('./footer.inc.php3');
+require('./footer.inc.php');
 
 ?>
diff --git a/server_common.inc.php3 b/server_common.inc.php
similarity index 85%
rename from server_common.inc.php3
rename to server_common.inc.php
index fa67f0c21..2113db598 100644
--- a/server_common.inc.php3
+++ b/server_common.inc.php
@@ -6,10 +6,10 @@
  * Gets some core libraries
  */
 if (!defined('PMA_GRAB_GLOBALS_INCLUDED')) {
-    include('./libraries/grab_globals.lib.php3');
+    include('./libraries/grab_globals.lib.php');
 }
 if (!defined('PMA_COMMON_LIB_INCLUDED')) {
-    include('./libraries/common.lib.php3');
+    include('./libraries/common.lib.php');
 }
 
 /**
@@ -30,12 +30,12 @@ $url_query = PMA_generate_common_url();
 /**
  * Defines the urls to return to in case of error in a sql statement
  */
-$err_url = 'main.php3' . $url_query;
+$err_url = 'main.php' . $url_query;
 
 /**
  * Displays the headers
  */
-require('./header.inc.php3');
+require('./header.inc.php');
 
 /**
  * Checks for superuser privileges
diff --git a/server_databases.php3 b/server_databases.php
similarity index 86%
rename from server_databases.php3
rename to server_databases.php
index 9df03d755..d90e43e29 100644
--- a/server_databases.php3
+++ b/server_databases.php
@@ -6,14 +6,14 @@
 /**
  * Checks if the left frame has to be reloaded
  */
-require('./libraries/grab_globals.lib.php3');
+require('./libraries/grab_globals.lib.php');
 
 
 /**
  * Does the common work
  */
 $js_to_run = 'functions.js';
-require('./server_common.inc.php3');
+require('./server_common.inc.php');
 
 ?>
 <script type="text/javascript" language="javascript1.2">
@@ -21,7 +21,7 @@ require('./server_common.inc.php3');
 function reload_window(db) {
     if (typeof(window.parent) != 'undefined'
         && typeof(window.parent.frames['nav']) != 'undefined') {
-        window.parent.frames['nav'].location.replace('./left.php3?db=' + db + '&hash=' + <?php echo (($cfg['QueryFrame'] && $cfg['QueryFrameJS']) ? 'window.parent.frames[\'queryframe\'].document.hashform.hash.value' : "'" . md5($cfg['PmaAbsoluteUri']) . "'"); ?>);
+        window.parent.frames['nav'].location.replace('./left.php?db=' + db + '&hash=' + <?php echo (($cfg['QueryFrame'] && $cfg['QueryFrameJS']) ? 'window.parent.frames[\'queryframe\'].document.hashform.hash.value' : "'" . md5($cfg['PmaAbsoluteUri']) . "'"); ?>);
     }
 }
 //-->
@@ -71,10 +71,10 @@ if ((!empty($drop_selected_dbs) || isset($query_type)) && ($is_superuser || $cfg
     if (empty($selected_db) && ! (isset($query_type) && !empty($selected))) {
         $message = $strNoDatabasesSelected;
     } else {
-        $action = 'server_databases.php3';
+        $action = 'server_databases.php';
         $submit_mult = 'drop_db' ;
-        $err_url = 'server_databases.php3?' . PMA_generate_common_url();
-        include('./mult_submits.inc.php3');
+        $err_url = 'server_databases.php?' . PMA_generate_common_url();
+        include('./mult_submits.inc.php');
         $message = sprintf($strDatabasesDropped, count($selected));
         // we need to reload the database list now.
         PMA_availableDatabases();
@@ -86,7 +86,7 @@ if ((!empty($drop_selected_dbs) || isset($query_type)) && ($is_superuser || $cfg
 /**
  * Displays the links
  */
-require('./server_links.inc.php3');
+require('./server_links.inc.php');
 
 
 /**
@@ -102,7 +102,7 @@ echo '<h2>' . "\n"
  */
 if (!empty($dbstats) && (!$is_superuser || PMA_MYSQL_INT_VERSION < 32303)) {
     echo $strNoPrivileges . "\n";
-    include('./footer.inc.php3');
+    include('./footer.inc.php');
     exit;
 }
 
@@ -151,7 +151,7 @@ usort($statistics, 'PMA_dbCmp');
  * Displays the page
  */
 if (count($statistics) > 0) {
-    echo '<form action="./server_databases.php3" method="post" name="dbStatsForm">' . "\n"
+    echo '<form action="./server_databases.php" method="post" name="dbStatsForm">' . "\n"
        . PMA_generate_common_hidden_inputs('', '', 1)
        . '    <input type="hidden" name="dbstats" value="' . (empty($dbstats) ? '0' : '1') . '" />' . "\n"
        . '    <input type="hidden" name="sort_by" value="' . $sort_by . '" />' . "\n"
@@ -168,7 +168,7 @@ if (count($statistics) > 0) {
            . '            </th>' . "\n";
     } else {
         echo "\n"
-           . '                <a href="./server_databases.php3?' . $url_query . '&amp;dbstats=1&amp;sort_by=db_name&amp;sort_order=' . (($sort_by == 'db_name' && $sort_order == 'asc') ? 'desc' : 'asc') . '">' . "\n"
+           . '                <a href="./server_databases.php?' . $url_query . '&amp;dbstats=1&amp;sort_by=db_name&amp;sort_order=' . (($sort_by == 'db_name' && $sort_order == 'asc') ? 'desc' : 'asc') . '">' . "\n"
            . '                    ' . $strDatabase . "\n"
            . ($sort_by == 'db_name' ? '                    <img src="./images/' . $sort_order . '_order.png" border="0" width="7" height="7"  alt="' . ($sort_order == 'asc' ? $strAscending : $strDescending) . '" />' . "\n" : '')
            . '                </a>' . "\n"
@@ -176,7 +176,7 @@ if (count($statistics) > 0) {
            . '            </th>' . "\n"
            . '            <th>' . "\n"
            . '                &nbsp;' . "\n"
-           . '                <a href="./server_databases.php3?' . $url_query . '&amp;dbstats=1&amp;sort_by=tbl_cnt&amp;sort_order=' . (($sort_by == 'tbl_cnt' && $sort_order == 'desc') ? 'asc' : 'desc') . '">' . "\n"
+           . '                <a href="./server_databases.php?' . $url_query . '&amp;dbstats=1&amp;sort_by=tbl_cnt&amp;sort_order=' . (($sort_by == 'tbl_cnt' && $sort_order == 'desc') ? 'asc' : 'desc') . '">' . "\n"
            . '                    ' . $strNumTables . "\n"
            . ($sort_by == 'tbl_cnt' ? '                    <img src="./images/' . $sort_order . '_order.png" border="0" width="7" height="7"  alt="' . ($sort_order == 'asc' ? $strAscending : $strDescending) . '" />' . "\n" : '')
            . '                </a>' . "\n"
@@ -184,7 +184,7 @@ if (count($statistics) > 0) {
            . '            </th>' . "\n"
            . '            <th colspan="2">' . "\n"
            . '                &nbsp;' . "\n"
-           . '                <a href="./server_databases.php3?' . $url_query . '&amp;dbstats=1&amp;sort_by=data_sz&amp;sort_order=' . (($sort_by == 'data_sz' && $sort_order == 'desc') ? 'asc' : 'desc') . '">' . "\n"
+           . '                <a href="./server_databases.php?' . $url_query . '&amp;dbstats=1&amp;sort_by=data_sz&amp;sort_order=' . (($sort_by == 'data_sz' && $sort_order == 'desc') ? 'asc' : 'desc') . '">' . "\n"
            . '                    ' . $strData . "\n"
            . ($sort_by == 'data_sz' ? '                    <img src="./images/' . $sort_order . '_order.png" border="0" width="7" height="7"  alt="' . ($sort_order == 'asc' ? $strAscending : $strDescending) . '" />' . "\n" : '')
            . '                </a>' . "\n"
@@ -192,7 +192,7 @@ if (count($statistics) > 0) {
            . '            </th>' . "\n"
            . '            <th colspan="2">' . "\n"
            . '                &nbsp;' . "\n"
-           . '                <a href="./server_databases.php3?' . $url_query . '&amp;dbstats=1&amp;sort_by=idx_sz&amp;sort_order=' . (($sort_by == 'idx_sz' && $sort_order == 'desc') ? 'asc' : 'desc') . '">' . "\n"
+           . '                <a href="./server_databases.php?' . $url_query . '&amp;dbstats=1&amp;sort_by=idx_sz&amp;sort_order=' . (($sort_by == 'idx_sz' && $sort_order == 'desc') ? 'asc' : 'desc') . '">' . "\n"
            . '                    ' . $strIndexes . "\n"
            . ($sort_by == 'idx_sz' ? '                    <img src="./images/' . $sort_order . '_order.png" border="0" width="7" height="7"  alt="' . ($sort_order == 'asc' ? $strAscending : $strDescending) . '" />' . "\n" : '')
            . '                </a>' . "\n"
@@ -200,7 +200,7 @@ if (count($statistics) > 0) {
            . '            </th>' . "\n"
            . '            <th colspan="2">' . "\n"
            . '                &nbsp;' . "\n"
-           . '                <a href="./server_databases.php3?' . $url_query . '&amp;dbstats=1&amp;sort_by=tot_sz&amp;sort_order=' . (($sort_by == 'tot_sz' && $sort_order == 'desc') ? 'asc' : 'desc') . '">' . "\n"
+           . '                <a href="./server_databases.php?' . $url_query . '&amp;dbstats=1&amp;sort_by=tot_sz&amp;sort_order=' . (($sort_by == 'tot_sz' && $sort_order == 'desc') ? 'asc' : 'desc') . '">' . "\n"
            . '                    ' . $strTotalUC . "\n"
            . ($sort_by == 'tot_sz' ? '                    <img src="./images/' . $sort_order . '_order.png" border="0" width="7" height="7"  alt="' . ($sort_order == 'asc' ? $strAscending : $strDescending) . '" />' . "\n" : '')
            . '                </a>' . "\n"
@@ -270,7 +270,7 @@ if (count($statistics) > 0) {
         }
         if ($is_superuser) {
             echo '            <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '">' . "\n"
-               . '                <a onclick="reload_window(\'' . urlencode($current['db_name']) . '\'); return true;" href="./server_privileges.php3?' . $url_query . '&amp;checkprivs=' . urlencode($current['db_name']) . '" title="' . sprintf($strCheckPrivsLong, htmlspecialchars($current['db_name'])) . '">'. "\n"
+               . '                <a onclick="reload_window(\'' . urlencode($current['db_name']) . '\'); return true;" href="./server_privileges.php?' . $url_query . '&amp;checkprivs=' . urlencode($current['db_name']) . '" title="' . sprintf($strCheckPrivsLong, htmlspecialchars($current['db_name'])) . '">'. "\n"
                . '                    ' . $strCheckPrivs . "\n"
                . '                </a>' . "\n"
                . '            </td>' . "\n";
@@ -316,11 +316,11 @@ if (count($statistics) > 0) {
         echo '    <tr>' . "\n"
            . '        <td colspan="' . (empty($dbstats) ? '10' : '3') . '">' . "\n"
            . '            <img src="./images/arrow_' . $text_dir . '.gif" border="0" width="38" height="22" alt="' . $strWithChecked . '" />' . "\n"
-           . '            <a href="./server_databases.php3?' . $common_url_query . '&amp;checkall=1" onclick="setCheckboxes(\'dbStatsForm\', true); return false;">' . "\n"
+           . '            <a href="./server_databases.php?' . $common_url_query . '&amp;checkall=1" onclick="setCheckboxes(\'dbStatsForm\', true); return false;">' . "\n"
            . '                ' . $strCheckAll
            . '            </a>' . "\n"
            . '            &nbsp;/&nbsp;' . "\n"
-           . '            <a href="./server_databases.php3?' . $common_url_query . '" onclick="setCheckboxes(\'dbStatsForm\', false); return false;">' . "\n"
+           . '            <a href="./server_databases.php?' . $common_url_query . '" onclick="setCheckboxes(\'dbStatsForm\', false); return false;">' . "\n"
            . '                ' . $strUncheckAll
            . '            </a>' . "\n"
            . '        </td>' . "\n"
@@ -339,7 +339,7 @@ if (count($statistics) > 0) {
     if ($is_superuser && empty($dbstats) && PMA_MYSQL_INT_VERSION >= 32303) {
         echo '        <li>' . "\n"
            . '            <b>' . "\n"
-           . '                <a href="./server_databases.php3?' . $url_query . '&amp;dbstats=1" title="' . $strDatabasesStatsEnable . '">' . "\n"
+           . '                <a href="./server_databases.php?' . $url_query . '&amp;dbstats=1" title="' . $strDatabasesStatsEnable . '">' . "\n"
            . '                    ' . $strDatabasesStatsEnable . "\n"
            . '                </a>' . "\n"
            . '            </b>' . "\n"
@@ -349,7 +349,7 @@ if (count($statistics) > 0) {
     } else if ($is_superuser && !empty($dbstats)) {
         echo '        <li>' . "\n"
            . '            <b>' . "\n"
-           . '                <a href="./server_databases.php3?' . $url_query . '" title="' . $strDatabasesStatsDisable . '">'. "\n"
+           . '                <a href="./server_databases.php?' . $url_query . '" title="' . $strDatabasesStatsDisable . '">'. "\n"
            . '                    ' . $strDatabasesStatsDisable . "\n"
            . '                </a>' . "\n"
            . '            </b>' . "\n"
@@ -373,6 +373,6 @@ if (count($statistics) > 0) {
 /**
  * Sends the footer
  */
-require('./footer.inc.php3');
+require('./footer.inc.php');
 
 ?>
diff --git a/server_export.php3 b/server_export.php
similarity index 84%
rename from server_export.php3
rename to server_export.php
index 5b30c3a77..345a83db8 100644
--- a/server_export.php3
+++ b/server_export.php
@@ -6,20 +6,20 @@
 /**
  * Checks if the left frame has to be reloaded
  */
-require('./libraries/grab_globals.lib.php3');
+require('./libraries/grab_globals.lib.php');
 
 
 /**
  * Does the common work
  */
 $js_to_run = 'functions.js';
-require('./server_common.inc.php3');
+require('./server_common.inc.php');
 
 
 /**
  * Displays the links
  */
-require('./server_links.inc.php3');
+require('./server_links.inc.php');
 
 /**
  * Gets the databases list - if it has not been built yet
@@ -52,9 +52,9 @@ while (list(, $current_db) = each($dblist)) {
 $multi_values .= "\n";
 $multi_values .= '</select></div>';
 
-$checkall_url = 'server_export.php3?' 
+$checkall_url = 'server_export.php?' 
               . PMA_generate_common_url()
-              . '&amp;goto=db_details_export.php3';
+              . '&amp;goto=db_details_export.php';
 
 $multi_values .= '<br />
         <a href="' . $checkall_url . '&amp;selectall=1" onclick="setSelectOptions(\'dump\', \'db_select[]\', true); return false;">' . $strSelectAll . '</a>
@@ -63,12 +63,12 @@ $multi_values .= '<br />
         <br /><br />';
 
 $export_type = 'server';
-require('./libraries/display_export.lib.php3');
+require('./libraries/display_export.lib.php');
 
 
 /**
  * Displays the footer
  */
-require('./footer.inc.php3');
+require('./footer.inc.php');
 ?>
 
diff --git a/server_links.inc.php3 b/server_links.inc.php
similarity index 69%
rename from server_links.inc.php3
rename to server_links.inc.php
index f23f36f14..39de062ce 100644
--- a/server_links.inc.php3
+++ b/server_links.inc.php
@@ -5,7 +5,7 @@
 // Check parameters
 
 if (!defined('PMA_COMMON_LIB_INCLUDED')) {
-    include('./libraries/common.lib.php3');
+    include('./libraries/common.lib.php');
 }
 PMA_checkParameters(array('is_superuser', 'url_query'));
 
@@ -48,21 +48,21 @@ if (!empty($message)) {
     <tr>
         <td width="8">&nbsp;</td>
 <?php
-echo PMA_printTab($strDatabases, 'server_databases.php3', $url_query);
+echo PMA_printTab($strDatabases, 'server_databases.php', $url_query);
 if ($cfg['ShowMysqlInfo']) {
-    echo PMA_printTab($strStatus, 'server_status.php3', $url_query);
+    echo PMA_printTab($strStatus, 'server_status.php', $url_query);
 }
 if ($cfg['ShowMysqlVars']) {
-    echo PMA_printTab($strServerTabVariables, 'server_variables.php3', $url_query);
+    echo PMA_printTab($strServerTabVariables, 'server_variables.php', $url_query);
 }
 if (PMA_MYSQL_INT_VERSION >= 40100) {
-    echo PMA_printTab($strCharsets, 'server_collations.php3', $url_query);
+    echo PMA_printTab($strCharsets, 'server_collations.php', $url_query);
 }
 if ($is_superuser) {
-    echo PMA_printTab($strPrivileges, 'server_privileges.php3', $url_query);
+    echo PMA_printTab($strPrivileges, 'server_privileges.php', $url_query);
 }
-echo PMA_printTab($strServerTabProcesslist, 'server_processlist.php3', $url_query);
-echo PMA_printTab($strExport, 'server_export.php3', $url_query);
+echo PMA_printTab($strServerTabProcesslist, 'server_processlist.php', $url_query);
+echo PMA_printTab($strExport, 'server_export.php', $url_query);
 ?>
     </tr>
 </table>
diff --git a/server_privileges.php3 b/server_privileges.php
similarity index 96%
rename from server_privileges.php3
rename to server_privileges.php
index 6767bd761..eb82182df 100644
--- a/server_privileges.php3
+++ b/server_privileges.php
@@ -7,7 +7,7 @@
  * Does the common work
  */
 $js_to_run = 'server_privileges.js';
-require('./server_common.inc.php3');
+require('./server_common.inc.php');
 
 
 /**
@@ -27,12 +27,12 @@ if (!empty($pred_tablename)) {
  * Checks if the user is allowed to do what he tries to...
  */
 if (!$is_superuser) {
-    include('./server_links.inc.php3');
+    include('./server_links.inc.php');
     echo '<h2>' . "\n"
        . '    ' . $strPrivileges . "\n"
        . '</h2>' . "\n"
        . $strNoPrivileges . "\n";
-    include('./footer.inc.php3');
+    include('./footer.inc.php');
     exit;
 }
 
@@ -931,7 +931,7 @@ if (!empty($flush_privileges)) {
 /**
  * Displays the links
  */
-require('./server_links.inc.php3');
+require('./server_links.inc.php');
 
 
 /**
@@ -978,7 +978,7 @@ if (empty($adduser) && empty($checkprivs)) {
                    . '    Please run the script <tt>mysql_fix_privilege_tables</tt> that should be included in your MySQL server distribution to solve this problem!' . "\n"
                    . '</div><br />' . "\n";
             }
-            echo '<form name="usersForm" action="server_privileges.php3" method="post" />' . "\n"
+            echo '<form name="usersForm" action="server_privileges.php" method="post" />' . "\n"
                . PMA_generate_common_hidden_inputs('', '', 1)
                . '    <table border="0">' . "\n"
                . '        <tr>' . "\n"
@@ -1002,7 +1002,7 @@ if (empty($adduser) && empty($checkprivs)) {
                    . '                ' . join(',' . "\n" . '            ', $privs) . "\n"
                    . '            </tt></td>' . "\n"
                    . '            <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '">' . ($row['Grant_priv'] == 'Y' ? $strYes : $strNo) . '</td>' . "\n"
-                   . '            <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '"><a href="server_privileges.php3?' . $url_query . '&amp;username=' . urlencode($row['User']) . '&amp;hostname=' . urlencode($row['Host']) . '">' . $strEdit . '</a></td>' . "\n"
+                   . '            <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '"><a href="server_privileges.php?' . $url_query . '&amp;username=' . urlencode($row['User']) . '&amp;hostname=' . urlencode($row['Host']) . '">' . $strEdit . '</a></td>' . "\n"
                    . '        </tr>' . "\n";
                 $useBgcolorOne = !$useBgcolorOne;
             }
@@ -1018,15 +1018,15 @@ if (empty($adduser) && empty($checkprivs)) {
                . '        <tr>' . "\n"
                . '            <td colspan="6" valign="bottom">' . "\n"
                . '                <img src="./images/arrow_' . $text_dir . '.gif" border="0" width="38" height="22" alt="' . $strWithChecked . '" />' . "\n"
-               . '                <a href="./server_privileges.php3?' . $url_query .  '&amp;checkall=1" onclick="setCheckboxes(\'usersForm\', \'selected_usr\', true); return false;">' . $strCheckAll . '</a>' . "\n"
+               . '                <a href="./server_privileges.php?' . $url_query .  '&amp;checkall=1" onclick="setCheckboxes(\'usersForm\', \'selected_usr\', true); return false;">' . $strCheckAll . '</a>' . "\n"
                . '                &nbsp;/&nbsp;' . "\n"
-               . '                <a href="server_privileges.php3?' . $url_query .  '" onclick="setCheckboxes(\'usersForm\', \'selected_usr\', false); return false;">' . $strUncheckAll . '</a>' . "\n"
+               . '                <a href="server_privileges.php?' . $url_query .  '" onclick="setCheckboxes(\'usersForm\', \'selected_usr\', false); return false;">' . $strUncheckAll . '</a>' . "\n"
                . '            </td>' . "\n"
                . '        </tr>' . "\n"
                . '    </table>' . "\n"
                . '    <ul>' . "\n"
                . '        <li>' . "\n"
-               . '            <b><a href="server_privileges.php3?' . $url_query . '&amp;adduser=1">' . $strAddUser . '</a></b><br />' . "\n"
+               . '            <b><a href="server_privileges.php?' . $url_query . '&amp;adduser=1">' . $strAddUser . '</a></b><br />' . "\n"
                . '        </li><br /><br />' . "\n"
                . '        <li>' . "\n"
                . '            <b>' . $strRemoveSelectedUsers . '</b><br />' . "\n"
@@ -1053,13 +1053,13 @@ if (empty($adduser) && empty($checkprivs)) {
                . '    </ul>' . "\n"
                . '</form>' . "\n"
                . '<div>' . "\n"
-               . '    ' . sprintf($strFlushPrivilegesNote, '<a href="server_privileges.php3?' . $url_query . '&amp;flush_privileges=1">', '</a>') . "\n"
+               . '    ' . sprintf($strFlushPrivilegesNote, '<a href="server_privileges.php?' . $url_query . '&amp;flush_privileges=1">', '</a>') . "\n"
                . '</div>' . "\n";
         }
     } else {
         // A user was selected -> display the user's properties
         echo '<h2>' . "\n"
-           . '    ' . $strUser . ' <i><a class="h2" href="server_privileges.php3?' . $url_query . '&amp;username=' . urlencode($username) . '&amp;hostname=' . urlencode($hostname) . '">\'' . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname) . '\'</a></i>' . "\n";
+           . '    ' . $strUser . ' <i><a class="h2" href="server_privileges.php?' . $url_query . '&amp;username=' . urlencode($username) . '&amp;hostname=' . urlencode($hostname) . '">\'' . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname) . '\'</a></i>' . "\n";
         if (!empty($dbname)) {
             echo '    - ' . $strDatabase . ' <i><a class="h2" href="' . $cfg['DefaultTabDatabase'] . '?' . $url_query . '&amp;db=' . urlencode($dbname) . '&amp;reload=1">' . htmlspecialchars($dbname) . '</a></i>' . "\n";
             if (!empty($tablename)) {
@@ -1070,14 +1070,14 @@ if (empty($adduser) && empty($checkprivs)) {
         $res = PMA_mysql_query('SELECT "foo" FROM `user` WHERE `User` = "' . PMA_sqlAddslashes($username) . '" AND `Host` = "' . $hostname . '";', $userlink);
         if (mysql_affected_rows($userlink) <= 0) {
             echo $strUserNotFound;
-            include('./footer.inc.php3');
+            include('./footer.inc.php');
             exit;
         }
         mysql_free_result($res);
         unset($res);
         echo '<ul>' . "\n"
            . '    <li>' . "\n"
-           . '        <form action="server_privileges.php3" method="post">' . "\n"
+           . '        <form action="server_privileges.php" method="post">' . "\n"
            . PMA_generate_common_hidden_inputs('', '', 3)
            . '            <input type="hidden" name="username" value="' . htmlspecialchars($username) . '" />' . "\n"
            . '            <input type="hidden" name="hostname" value="' . htmlspecialchars($hostname) . '" />' . "\n";
@@ -1135,8 +1135,8 @@ if (empty($adduser) && empty($checkprivs)) {
                             echo '                <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '">' . $strNo . '</td>' . "\n";
                         }
                         echo '                <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '">' . $strYes . '</td>' . "\n"
-                           . '                <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '"><a href="server_privileges.php3?' . $url_query . '&amp;username=' . urlencode($username) . '&amp;hostname=' . urlencode($hostname) . '&amp;dbname=' . urlencode($row2['Db']) . '">' . $strEdit . '</a></td>' . "\n"
-                           . '                <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '"><a href="server_privileges.php3?' . $url_query . '&amp;username=' . urlencode($username) . '&amp;hostname=' . urlencode($hostname) . '&amp;dbname=' . urlencode($row2['Db']) . '&amp;revokeall=1">' . $strRevoke . '</a></td>' . "\n"
+                           . '                <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '"><a href="server_privileges.php?' . $url_query . '&amp;username=' . urlencode($username) . '&amp;hostname=' . urlencode($hostname) . '&amp;dbname=' . urlencode($row2['Db']) . '">' . $strEdit . '</a></td>' . "\n"
+                           . '                <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '"><a href="server_privileges.php?' . $url_query . '&amp;username=' . urlencode($username) . '&amp;hostname=' . urlencode($hostname) . '&amp;dbname=' . urlencode($row2['Db']) . '&amp;revokeall=1">' . $strRevoke . '</a></td>' . "\n"
                            . '            </tr>' . "\n";
                         $row2 = PMA_mysql_fetch_array($res2, MYSQL_ASSOC);
                         $useBgcolorOne = !$useBgcolorOne;
@@ -1162,8 +1162,8 @@ if (empty($adduser) && empty($checkprivs)) {
                         echo $strNo;
                     }
                     echo '</td>' . "\n"
-                       . '                <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '"><a href="server_privileges.php3?' . $url_query . '&amp;username=' . urlencode($username) . '&amp;hostname=' . urlencode($hostname) . '&amp;dbname=' . (empty($dbname) ? urlencode($row['Db']) : urlencode($dbname) . '&amp;tablename=' . urlencode($row['Table_name'])) . '">' . $strEdit . '</a></td>' . "\n"
-                       . '                <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '"><a href="server_privileges.php3?' . $url_query . '&amp;username=' . urlencode($username) . '&amp;hostname=' . urlencode($hostname) . '&amp;dbname=' . (empty($dbname) ? urlencode($row['Db']) : urlencode($dbname) . '&amp;tablename=' . urlencode($row['Table_name'])) . '&amp;revokeall=1">' . $strRevoke . '</a></td>' . "\n"
+                       . '                <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '"><a href="server_privileges.php?' . $url_query . '&amp;username=' . urlencode($username) . '&amp;hostname=' . urlencode($hostname) . '&amp;dbname=' . (empty($dbname) ? urlencode($row['Db']) : urlencode($dbname) . '&amp;tablename=' . urlencode($row['Table_name'])) . '">' . $strEdit . '</a></td>' . "\n"
+                       . '                <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '"><a href="server_privileges.php?' . $url_query . '&amp;username=' . urlencode($username) . '&amp;hostname=' . urlencode($hostname) . '&amp;dbname=' . (empty($dbname) ? urlencode($row['Db']) : urlencode($dbname) . '&amp;tablename=' . urlencode($row['Table_name'])) . '&amp;revokeall=1">' . $strRevoke . '</a></td>' . "\n"
                        . '            </tr>' . "\n";
                     $useBgcolorOne = !$useBgcolorOne;
                 } // end while
@@ -1182,8 +1182,8 @@ if (empty($adduser) && empty($checkprivs)) {
                         echo '                <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '">' . $strNo . '</td>' . "\n";
                     }
                     echo '                <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '">' . $strYes . '</td>' . "\n"
-                       . '                <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '"><a href="server_privileges.php3?' . $url_query . '&amp;username=' . urlencode($username) . '&amp;hostname=' . urlencode($hostname) . '&amp;dbname=' . urlencode($row2['Db']) . '">' . $strEdit . '</a></td>' . "\n"
-                       . '                <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '"><a href="server_privileges.php3?' . $url_query . '&amp;username=' . urlencode($username) . '&amp;hostname=' . urlencode($hostname) . '&amp;dbname=' . urlencode($row2['Db']) . '&amp;revokeall=1">' . $strRevoke . '</a></td>' . "\n"
+                       . '                <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '"><a href="server_privileges.php?' . $url_query . '&amp;username=' . urlencode($username) . '&amp;hostname=' . urlencode($hostname) . '&amp;dbname=' . urlencode($row2['Db']) . '">' . $strEdit . '</a></td>' . "\n"
+                       . '                <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '"><a href="server_privileges.php?' . $url_query . '&amp;username=' . urlencode($username) . '&amp;hostname=' . urlencode($hostname) . '&amp;dbname=' . urlencode($row2['Db']) . '&amp;revokeall=1">' . $strRevoke . '</a></td>' . "\n"
                        . '            </tr>' . "\n";
                     $row2 = PMA_mysql_fetch_array($res2, MYSQL_ASSOC);
 
@@ -1200,7 +1200,7 @@ if (empty($adduser) && empty($checkprivs)) {
             unset($row);
             echo '            <tr>' . "\n"
                . '                <td colspan="' .(PMA_MYSQL_INT_VERSION >= 32211 ? '5' : '4') . '">' . "\n"
-               . '                    <form action="server_privileges.php3" method="post">' . "\n"
+               . '                    <form action="server_privileges.php" method="post">' . "\n"
                . PMA_generate_common_hidden_inputs('', '', 6)
                . '                        <input type="hidden" name="username" value="' . htmlspecialchars($username) . '" />' . "\n"
                . '                        <input type="hidden" name="hostname" value="' . htmlspecialchars($hostname) . '" />' . "\n";
@@ -1260,7 +1260,7 @@ if (empty($adduser) && empty($checkprivs)) {
         }
         if (empty($dbname)) {
             echo '    <li>' . "\n"
-               . '        <form action="server_privileges.php3" method="post" onsubmit="checkPassword(this);">' . "\n"
+               . '        <form action="server_privileges.php" method="post" onsubmit="checkPassword(this);">' . "\n"
                . PMA_generate_common_hidden_inputs('', '', 3)
                . '            <input type="hidden" name="username" value="' . htmlspecialchars($username) . '" />' . "\n"
                . '            <input type="hidden" name="hostname" value="' . htmlspecialchars($hostname) . '" />' . "\n";
@@ -1290,7 +1290,7 @@ if (empty($adduser) && empty($checkprivs)) {
                . '    </li>' . "\n";
             if (PMA_MYSQL_INT_VERSION >= 32211) {
                 echo '    <li>' . "\n"
-                   . '        <form action="server_privileges.php3" method="post" onsubmit="checkPassword(this);">' . "\n"
+                   . '        <form action="server_privileges.php" method="post" onsubmit="checkPassword(this);">' . "\n"
                    . PMA_generate_common_hidden_inputs('', '', 3)
                    . '            <input type="hidden" name="old_username" value="' . htmlspecialchars($username) . '" />' . "\n"
                    . '            <input type="hidden" name="old_hostname" value="' . htmlspecialchars($hostname) . '" />' . "\n";
@@ -1331,7 +1331,7 @@ if (empty($adduser) && empty($checkprivs)) {
     echo '<h2>' . "\n"
        . '    ' . $strAddUser . "\n"
        . '</h2>' . "\n"
-       . '<form action="server_privileges.php3" method="post" onsubmit="return checkAddUser(this);">' . "\n"
+       . '<form action="server_privileges.php" method="post" onsubmit="return checkAddUser(this);">' . "\n"
        . PMA_generate_common_hidden_inputs('', '', 1)
        . '    <table border="0">' . "\n"
        . '        <tr>' . "\n"
@@ -1465,7 +1465,7 @@ if (empty($adduser) && empty($checkprivs)) {
                        . '        </td>' . "\n";
                 }
                 echo '        <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '">' . "\n"
-                   . '            <a href="./server_privileges.php3?' . $url_query . '&amp;username=' . urlencode($current_user) . '&amp;hostname=' . urlencode($current_host) . (!isset($current['Db']) || $current['Db'] == '*' ? '' : '&amp;dbname=' . urlencode($current['Db'])) . '">' . "\n"
+                   . '            <a href="./server_privileges.php?' . $url_query . '&amp;username=' . urlencode($current_user) . '&amp;hostname=' . urlencode($current_host) . (!isset($current['Db']) || $current['Db'] == '*' ? '' : '&amp;dbname=' . urlencode($current['Db'])) . '">' . "\n"
                    . '                ' . $strEdit . "\n"
                    . '            </a>' . "\n"
                    . '        </td>' . "\n"
@@ -1491,6 +1491,6 @@ if (empty($adduser) && empty($checkprivs)) {
  * Displays the footer
  */
 echo "\n\n";
-require('./footer.inc.php3');
+require('./footer.inc.php');
 
 ?>
diff --git a/server_processlist.php3 b/server_processlist.php
similarity index 84%
rename from server_processlist.php3
rename to server_processlist.php
index 605b31f6b..2c07c717f 100644
--- a/server_processlist.php3
+++ b/server_processlist.php
@@ -6,7 +6,7 @@
 /**
  * Does the common work
  */
-require('./server_common.inc.php3');
+require('./server_common.inc.php');
 
 
 /**
@@ -25,7 +25,7 @@ if (!empty($kill)) {
 /**
  * Displays the links
  */
-require('./server_links.inc.php3');
+require('./server_links.inc.php');
 
 
 /**
@@ -56,7 +56,7 @@ unset($row);
 ?>
 <table border="0">
     <tr>
-        <th><?php echo PMA_MYSQL_INT_VERSION < 32307 ? '' : '<a href="./server_processlist.php3?'. $url_query . (empty($full) ? '&amp;full=1' : '') . '" title="' . (empty($full) ? $strShowFullQueries : $strTruncateQueries) . '"><img src="./images/' . (empty($full) ? 'full' : 'partial') . 'text.png" width="50" height="20" border="0" alt="' . (empty($full) ? $strShowFullQueries : $strTruncateQueries) . '" /></a>';  ?></th>
+        <th><?php echo PMA_MYSQL_INT_VERSION < 32307 ? '' : '<a href="./server_processlist.php?'. $url_query . (empty($full) ? '&amp;full=1' : '') . '" title="' . (empty($full) ? $strShowFullQueries : $strTruncateQueries) . '"><img src="./images/' . (empty($full) ? 'full' : 'partial') . 'text.png" width="50" height="20" border="0" alt="' . (empty($full) ? $strShowFullQueries : $strTruncateQueries) . '" /></a>';  ?></th>
         <th>&nbsp;<?php echo $strId; ?>&nbsp;</th>
         <th>&nbsp;<?php echo $strUser; ?>&nbsp;</th>
         <th>&nbsp;<?php echo $strHost; ?>&nbsp;</th>
@@ -71,7 +71,7 @@ $useBgcolorOne = TRUE;
 while (list($name, $value) = each($serverProcesses)) {
 ?>
     <tr>
-        <td bgcolor="<?php echo $useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']; ?>">&nbsp;<a href="./server_processlist.php3?<?php echo $url_query . '&amp;kill=' . $value['Id']; ?>"><?php echo $strKill; ?></a>&nbsp;</td>
+        <td bgcolor="<?php echo $useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']; ?>">&nbsp;<a href="./server_processlist.php?<?php echo $url_query . '&amp;kill=' . $value['Id']; ?>"><?php echo $strKill; ?></a>&nbsp;</td>
         <td bgcolor="<?php echo $useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']; ?>" align="right">&nbsp;<?php echo $value['Id']; ?>&nbsp;</td>
         <td bgcolor="<?php echo $useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']; ?>">&nbsp;<?php echo $value['User']; ?>&nbsp;</td>
         <td bgcolor="<?php echo $useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']; ?>">&nbsp;<?php echo $value['Host']; ?>&nbsp;</td>
@@ -94,6 +94,6 @@ while (list($name, $value) = each($serverProcesses)) {
 /**
  * Sends the footer
  */
-require('./footer.inc.php3');
+require('./footer.inc.php');
 
 ?>
diff --git a/server_status.php3 b/server_status.php
similarity index 98%
rename from server_status.php3
rename to server_status.php
index cf5de8915..7c5de29bc 100644
--- a/server_status.php3
+++ b/server_status.php
@@ -6,13 +6,13 @@
 /**
  * Does the common work
  */
-require('./server_common.inc.php3');
+require('./server_common.inc.php');
 
 
 /**
  * Displays the links
  */
-require('./server_links.inc.php3');
+require('./server_links.inc.php');
 
 
 /**
@@ -29,7 +29,7 @@ if (!empty($innodbstatus)) {
        . htmlspecialchars($row[0]) . "\n"
        . '</pre>' . "\n";
     mysql_free_result($res);
-    include('./footer.inc.php3');
+    include('./footer.inc.php');
     exit;
 }
 
@@ -46,7 +46,7 @@ echo '<h2>' . "\n"
  */
 if (!$is_superuser && !$cfg['ShowMysqlInfo']) {
     echo $strNoPrivileges;
-    include('./footer.inc.php3');
+    include('./footer.inc.php');
     exit;
 }
 
@@ -282,7 +282,7 @@ if ($res) {
     <br />
     <li>
         <!-- InnoDB Status -->
-        <a href="./server_status.php3?<?php echo $url_query; ?>&amp;innodbstatus=1">
+        <a href="./server_status.php?<?php echo $url_query; ?>&amp;innodbstatus=1">
             <b><?php echo $strInnodbStat; ?></b>
         </a>
     </li>
@@ -301,6 +301,6 @@ if ($res) {
 /**
  * Sends the footer
  */
-require('./footer.inc.php3');
+require('./footer.inc.php');
 
 ?>
diff --git a/server_variables.php3 b/server_variables.php
similarity index 94%
rename from server_variables.php3
rename to server_variables.php
index d13b3bcec..30cff3d91 100644
--- a/server_variables.php3
+++ b/server_variables.php
@@ -6,13 +6,13 @@
 /**
  * Does the common work
  */
-require('./server_common.inc.php3');
+require('./server_common.inc.php');
 
 
 /**
  * Displays the links
  */
-require('./server_links.inc.php3');
+require('./server_links.inc.php');
 
 
 /**
@@ -28,7 +28,7 @@ echo '<h2>' . "\n"
  */
 if (!$is_superuser && !$cfg['ShowMysqlVars']) {
     echo $strNoPrivileges;
-    include('./footer.inc.php3');
+    include('./footer.inc.php');
     exit;
 }
 
@@ -108,6 +108,6 @@ while (list($name, $value) = each($serverVars)) {
 /**
  * Sends the footer
  */
-require('./footer.inc.php3');
+require('./footer.inc.php');
 
 ?>
\ No newline at end of file
diff --git a/sql.php3 b/sql.php
old mode 100755
new mode 100644
similarity index 94%
rename from sql.php3
rename to sql.php
index dbdf316d7..048686c65
--- a/sql.php3
+++ b/sql.php
@@ -5,8 +5,8 @@
 /**
  * Gets some core libraries
  */
-require('./libraries/grab_globals.lib.php3');
-require('./libraries/common.lib.php3');
+require('./libraries/grab_globals.lib.php');
+require('./libraries/common.lib.php');
 
 
 /**
@@ -61,7 +61,7 @@ if (!defined('PMA_CHK_DROP')
     // loic1: optimized query
     $result = @PMA_mysql_query('USE mysql');
     if (PMA_mysql_error()) {
-        include('./header.inc.php3');
+        include('./header.inc.php');
         PMA_mysqlDie($strNoDropDatabases, '', '', $err_url);
     } // end if
 } // end if
@@ -71,7 +71,7 @@ if (!defined('PMA_CHK_DROP')
  * Bookmark add
  */
 if (isset($store_bkm)) {
-    include('./libraries/bookmark.lib.php3');
+    include('./libraries/bookmark.lib.php');
     PMA_addBookmarks($fields, $cfg['Bookmark'], (isset($bkm_all_users) && $bkm_all_users == 'true' ? true : false));
     header('Location: ' . $cfg['PmaAbsoluteUri'] . $goto);
 } // end if
@@ -131,8 +131,8 @@ if ($is_select) {
 /**
  * Sets or modifies the $goto variable if required
  */
-if ($goto == 'sql.php3') {
-    $goto = 'sql.php3?'
+if ($goto == 'sql.php') {
+    $goto = 'sql.php?'
           . PMA_generate_common_url($db, $table)
           . '&amp;pos=' . $pos
           . '&amp;sql_query=' . urlencode($sql_query);
@@ -187,11 +187,11 @@ if (!$cfg['Confirm']
 
 if ($do_confirm) {
     $stripped_sql_query = $sql_query;
-    include('./header.inc.php3');
+    include('./header.inc.php');
     echo $strDoYouReally . '&nbsp;:<br />' . "\n";
     echo '<tt>' . htmlspecialchars($stripped_sql_query) . '</tt>&nbsp;?<br/>' . "\n";
     ?>
-<form action="sql.php3" method="post">
+<form action="sql.php" method="post">
     <?php echo PMA_generate_common_hidden_inputs($db, (isset($table)?$table:'')); ?>
     <input type="hidden" name="sql_query" value="<?php echo urlencode($sql_query); ?>" />
     <input type="hidden" name="zero_rows" value="<?php echo isset($zero_rows) ? $zero_rows : ''; ?>" />
@@ -324,7 +324,7 @@ else {
         // Displays an error message if required and stop parsing the script
         if (PMA_mysql_error()) {
             $error        = PMA_mysql_error();
-            include('./header.inc.php3');
+            include('./header.inc.php');
             $full_err_url = (ereg('^(db_details|tbl_properties)', $err_url))
                           ? $err_url . '&amp;show_query=1&amp;sql_query=' . urlencode($sql_query)
                           : $err_url;
@@ -498,7 +498,7 @@ else {
 
         // garvin: if a table or database gets dropped, check column comments.
         if (isset($purge) && $purge == '1') {
-            include('./libraries/relation_cleanup.lib.php3');
+            include('./libraries/relation_cleanup.lib.php');
 
             if (isset($table) && isset($db) && !empty($table) && !empty($db)) {
                 PMA_relationsCleanupTable($db, $table);
@@ -513,7 +513,7 @@ else {
         if (isset($cpurge) && $cpurge == '1' && isset($purgekey)
             && isset($db) && isset($table)
             && !empty($db) && !empty($table) && !empty($purgekey)) {
-            include('./libraries/relation_cleanup.lib.php3');
+            include('./libraries/relation_cleanup.lib.php');
             PMA_relationsCleanupColumn($db, $table, $purgekey);
 
         } // end if column PMA_* purge
@@ -556,11 +556,11 @@ else {
             $is_db = $is_table = FALSE;
             if (strpos(' ' . $goto, 'tbl_properties') == 1) {
                 if (!isset($table)) {
-                    $goto     = 'db_details.php3';
+                    $goto     = 'db_details.php';
                 } else {
                     $is_table = @PMA_mysql_query('SHOW TABLES LIKE \'' . PMA_sqlAddslashes($table, TRUE) . '\'');
                     if (!($is_table && @mysql_numrows($is_table))) {
-                        $goto = 'db_details.php3';
+                        $goto = 'db_details.php';
                         unset($table);
                     }
                 } // end if... else...
@@ -570,11 +570,11 @@ else {
                     unset($table);
                 }
                 if (!isset($db)) {
-                    $goto     = 'main.php3';
+                    $goto     = 'main.php';
                 } else {
                     $is_db    = @PMA_mysql_select_db($db);
                     if (!$is_db) {
-                        $goto = 'main.php3';
+                        $goto = 'main.php';
                         unset($db);
                     }
                 } // end if... else...
@@ -584,8 +584,8 @@ else {
                 || strpos(' ' . $goto, 'tbl_properties') == 1) {
                 $js_to_run = 'functions.js';
             }
-            if ($goto != 'main.php3') {
-                include('./header.inc.php3');
+            if ($goto != 'main.php') {
+                include('./header.inc.php');
             }
             $active_page = $goto;
             include('./' . $goto);
@@ -603,22 +603,22 @@ else {
             unset($show_query);
         }
         if (isset($printview) && $printview == '1') {
-            include('./header_printview.inc.php3');
+            include('./header_printview.inc.php');
         } else {
             $js_to_run = 'functions.js';
             unset($message);
             if (!empty($table)) {
-                include('./tbl_properties_common.php3');
-                $url_query .= '&amp;goto=tbl_properties.php3&amp;back=tbl_properties.php3';
-                include('./tbl_properties_table_info.php3');
+                include('./tbl_properties_common.php');
+                $url_query .= '&amp;goto=tbl_properties.php&amp;back=tbl_properties.php';
+                include('./tbl_properties_table_info.php');
             }
             else {
-                include('./db_details_common.php3');
-                include('./db_details_db_info.php3');
+                include('./db_details_common.php');
+                include('./db_details_db_info.php');
             }
         }
 
-        include('./libraries/relation.lib.php3');
+        include('./libraries/relation.lib.php');
         $cfgRelation = PMA_getRelationsParam();
 
         // Gets the list of fields properties
@@ -641,10 +641,10 @@ else {
         }
 
         // Displays the results in a table
-        include('./libraries/display_tbl.lib.php3');
+        include('./libraries/display_tbl.lib.php');
         if (empty($disp_mode)) {
             // see the "PMA_setDisplayMode()" function in
-            // libraries/display_tbl.lib.php3
+            // libraries/display_tbl.lib.php
             $disp_mode = 'urdr111101';
         }
         if (!isset($dontlimitchars)) {
@@ -660,7 +660,7 @@ else {
 
             // Displays "Insert a new row" link if required
             if ($disp_mode[6] == '1') {
-                $lnk_goto  = 'sql.php3?'
+                $lnk_goto  = 'sql.php?'
                            . PMA_generate_common_url($db, $table)
                            . '&amp;pos=' . $pos
                            . '&amp;session_max_rows=' . $session_max_rows
@@ -679,7 +679,7 @@ else {
                            . '&amp;goto=' . urlencode($lnk_goto);
 
                 echo '    <!-- Insert a new row -->' . "\n"
-                   . '    <a href="tbl_change.php3' . $url_query . '">' . $strInsertNewRow . '</a>';
+                   . '    <a href="tbl_change.php' . $url_query . '">' . $strInsertNewRow . '</a>';
                 if ($disp_mode[9] == '1') {
                     echo '<br />';
                 }
@@ -697,12 +697,12 @@ else {
                            . '&amp;printview=1'
                            . '&amp;sql_query=' . urlencode($sql_query);
                 echo '    <!-- Print view -->' . "\n"
-                   . '    <a href="sql.php3' . $url_query
+                   . '    <a href="sql.php' . $url_query
                    . ((isset($dontlimitchars) && $dontlimitchars == '1') ? '&amp;dontlimitchars=1' : '')
                    . '" target="print_view">' . $strPrintView . '</a>' . "\n";
                 if (!$dontlimitchars) {
                    echo   '    <br />' . "\n"
-                        . '    <a href="sql.php3' . $url_query
+                        . '    <a href="sql.php' . $url_query
                         . '&amp;dontlimitchars=1'
                         . '" target="print_view">' . $strPrintViewFull . '</a>' . "\n";
                 }
@@ -720,7 +720,7 @@ else {
                 $single_table   = '';
             }
             echo '    <!-- Export -->' . "\n"
-                   . '    <a href="tbl_properties_export.php3' . $url_query
+                   . '    <a href="tbl_properties_export.php' . $url_query
                    . '&amp;unlim_num_rows=' . $unlim_num_rows
                    . $single_table
                    . '">' . $strExport . '</a>' . "\n";
@@ -732,7 +732,7 @@ else {
             && !empty($sql_query)) {
             echo "\n";
 
-            $goto = 'sql.php3?'
+            $goto = 'sql.php?'
                   . PMA_generate_common_url($db, $table)
                   . '&amp;pos=' . $pos
                   . '&amp;session_max_rows=' . $session_max_rows
@@ -743,7 +743,7 @@ else {
                   . '&amp;id_bookmark=1';
             ?>
 <!-- Bookmark the query -->
-<form action="sql.php3" method="post" onsubmit="return emptyFormElements(this, 'fields[label]');">
+<form action="sql.php" method="post" onsubmit="return emptyFormElements(this, 'fields[label]');">
             <?php
             echo "\n";
             if ($disp_mode[3] == '1') {
@@ -786,5 +786,5 @@ echo "\n\n";
 /**
  * Displays the footer
  */
-require('./footer.inc.php3');
+require('./footer.inc.php');
 ?>
diff --git a/tbl_addfield.php3 b/tbl_addfield.php
old mode 100755
new mode 100644
similarity index 94%
rename from tbl_addfield.php3
rename to tbl_addfield.php
index 8b8263510..216f27fdb
--- a/tbl_addfield.php3
+++ b/tbl_addfield.php
@@ -6,9 +6,9 @@
 /**
  * Get some core libraries
  */
-require('./libraries/grab_globals.lib.php3');
+require('./libraries/grab_globals.lib.php');
 $js_to_run = 'functions.js';
-require('./header.inc.php3');
+require('./header.inc.php');
 
 // Check parameters
 PMA_checkParameters(array('db', 'table'));
@@ -17,7 +17,7 @@ PMA_checkParameters(array('db', 'table'));
 /**
  * Defines the url to return to in case of error in a sql statement
  */
-$err_url = 'tbl_properties.php3?' . PMA_generate_common_url($db, $table);
+$err_url = 'tbl_properties.php?' . PMA_generate_common_url($db, $table);
 
 
 /**
@@ -186,8 +186,8 @@ if (isset($submit)) {
         } // end if
 
         // garvin: If comments were sent, enable relation stuff
-        require('./libraries/relation.lib.php3');
-        require('./libraries/transformations.lib.php3');
+        require('./libraries/relation.lib.php');
+        require('./libraries/transformations.lib.php');
 
         $cfgRelation = PMA_getRelationsParam();
 
@@ -211,14 +211,14 @@ if (isset($submit)) {
         $sql_query = $sql_query_cpy;
         unset($sql_query_cpy);
         $message   = $strTable . ' ' . htmlspecialchars($table) . ' ' . $strHasBeenAltered;
-        $active_page = 'tbl_properties_structure.php3';
-        include('./tbl_properties_structure.php3');
+        $active_page = 'tbl_properties_structure.php';
+        include('./tbl_properties_structure.php');
         exit();
     } else {
         PMA_mysqlDie('', '', '', $err_url, FALSE);
         // garvin: An error happened while inserting/updating a table definition.
         // to prevent total loss of that data, we embed the form once again.
-        // The variable $regenerate will be used to restore data in tbl_properties.inc.php3
+        // The variable $regenerate will be used to restore data in tbl_properties.inc.php
         $num_fields = $orig_num_fields;
         if (isset($orig_after_field)) {
             $after_field = $orig_after_field;
@@ -231,12 +231,12 @@ if (isset($submit)) {
  * Displays the form used to define the new field
  */
 if ($abort == FALSE) {
-    $action = 'tbl_addfield.php3';
-    include('./tbl_properties.inc.php3');
+    $action = 'tbl_addfield.php';
+    include('./tbl_properties.inc.php');
 
     // Diplays the footer
     echo "\n";
-    include('./footer.inc.php3');
+    include('./footer.inc.php');
 }
 
 ?>
diff --git a/tbl_alter.php3 b/tbl_alter.php
old mode 100755
new mode 100644
similarity index 93%
rename from tbl_alter.php3
rename to tbl_alter.php
index c6967f72b..2f3f1f92f
--- a/tbl_alter.php3
+++ b/tbl_alter.php
@@ -6,9 +6,9 @@
 /**
  * Gets some core libraries
  */
-require('./libraries/grab_globals.lib.php3');
+require('./libraries/grab_globals.lib.php');
 $js_to_run = 'functions.js';
-include('./header.inc.php3');
+include('./header.inc.php');
 
 // Check parameters
 PMA_checkParameters(array('db', 'table'));
@@ -16,7 +16,7 @@ PMA_checkParameters(array('db', 'table'));
 /**
  * Defines the url to return to in case of error in a sql statement
  */
-$err_url = 'tbl_properties_structure.php3?' . PMA_generate_common_url($db, $table);
+$err_url = 'tbl_properties_structure.php?' . PMA_generate_common_url($db, $table);
 
 
 /**
@@ -31,7 +31,7 @@ if (isset($submit)) {
         }
 
         // Some fields have been urlencoded or double quotes have been translated
-        // to "&quot;" in tbl_properties.php3
+        // to "&quot;" in tbl_properties.php
         $field_orig[$i]     = urldecode($field_orig[$i]);
         if (strcmp(str_replace('"', '&quot;', $field_orig[$i]), $field_name[$i]) == 0) {
             $field_name[$i] = $field_orig[$i];
@@ -89,8 +89,8 @@ if (isset($submit)) {
         $btnDrop   = 'Fake';
 
         // garvin: If comments were sent, enable relation stuff
-        require('./libraries/relation.lib.php3');
-        require('./libraries/transformations.lib.php3');
+        require('./libraries/relation.lib.php');
+        require('./libraries/transformations.lib.php');
 
         $cfgRelation = PMA_getRelationsParam();
 
@@ -149,14 +149,14 @@ if (isset($submit)) {
             }
         }
 
-        $active_page = 'tbl_properties_structure.php3';
-        include('./tbl_properties_structure.php3');
+        $active_page = 'tbl_properties_structure.php';
+        include('./tbl_properties_structure.php');
         exit();
     } else {
         PMA_mysqlDie('', '', '', $err_url, FALSE);
         // garvin: An error happened while inserting/updating a table definition.
         // to prevent total loss of that data, we embed the form once again.
-        // The variable $regenerate will be used to restore data in tbl_properties.inc.php3
+        // The variable $regenerate will be used to restore data in tbl_properties.inc.php
         if (isset($orig_field)) {
                 $field = $orig_field;
         }
@@ -191,13 +191,13 @@ if ($abort == FALSE) {
     }
 
     $num_fields  = count($fields_meta);
-    $action      = 'tbl_alter.php3';
-    include('./tbl_properties.inc.php3');
+    $action      = 'tbl_alter.php';
+    include('./tbl_properties.inc.php');
 }
 
 
 /**
  * Displays the footer
  */
-require('./footer.inc.php3');
+require('./footer.inc.php');
 ?>
diff --git a/tbl_change.php3 b/tbl_change.php
old mode 100755
new mode 100644
similarity index 97%
rename from tbl_change.php3
rename to tbl_change.php
index 28323e1b6..9ecb68fb5
--- a/tbl_change.php3
+++ b/tbl_change.php
@@ -6,10 +6,10 @@
 /**
  * Get the variables sent or posted to this script and displays the header
  */
-require('./libraries/grab_globals.lib.php3');
+require('./libraries/grab_globals.lib.php');
 $js_to_run = 'tbl_change.js';
-require('./header.inc.php3');
-require('./libraries/relation.lib.php3'); // foreign keys
+require('./header.inc.php');
+require('./libraries/relation.lib.php'); // foreign keys
 
 
 /**
@@ -18,7 +18,7 @@ require('./libraries/relation.lib.php3'); // foreign keys
 if (!empty($disp_message)) {
     if (isset($goto)) {
         $goto_cpy      = $goto;
-        $goto          = 'tbl_properties.php3?'
+        $goto          = 'tbl_properties.php?'
                        . PMA_generate_common_url($db, $table)
                        . '&amp;$show_query=1'
                        . '&amp;sql_query=' . (isset($disp_query) ? urlencode($disp_query) : '');
@@ -48,7 +48,7 @@ if (!empty($disp_message)) {
  * Defines the url to return to in case of error in a sql statement
  */
 if (!isset($goto)) {
-    $goto    = 'db_details.php3';
+    $goto    = 'db_details.php';
 }
 if (!ereg('^(db_details|tbl_properties|tbl_select)', $goto)) {
     $err_url = $goto . "?" . PMA_generate_common_url($db) . "&amp;sql_query=" . urlencode($sql_query);
@@ -62,16 +62,16 @@ if (!ereg('^(db_details|tbl_properties|tbl_select)', $goto)) {
 /**
  * Ensures db and table are valid, else moves to the "parent" script
  */
-require('./libraries/db_table_exists.lib.php3');
+require('./libraries/db_table_exists.lib.php');
 
 
 /**
  * Sets parameters for links and displays top menu
  */
 $url_query = PMA_generate_common_url($db, $table)
-           . '&amp;goto=tbl_properties.php3';
+           . '&amp;goto=tbl_properties.php';
 
-require('./tbl_properties_table_info.php3');
+require('./tbl_properties_table_info.php');
 echo '<br />';
 
 
@@ -90,7 +90,7 @@ if (isset($primary_key)) {
         unset($row);
         unset($primary_key);
         $goto_cpy          = $goto;
-        $goto              = 'tbl_properties.php3?'
+        $goto              = 'tbl_properties.php?'
                            . PMA_generate_common_url($db, $table)
                            . '&amp;$show_query=1'
                            . '&amp;sql_query=' . urlencode($local_query);
@@ -143,7 +143,7 @@ document.onkeydown = onKeyDownArrowsHandler;
 <?php } ?>
 
 <!-- Change table properties form -->
-<form method="post" action="tbl_replace.php3" name="insertForm" <?php if ($is_upload) echo ' enctype="multipart/form-data"'; ?>>
+<form method="post" action="tbl_replace.php" name="insertForm" <?php if ($is_upload) echo ' enctype="multipart/form-data"'; ?>>
     <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
     <input type="hidden" name="goto" value="<?php echo $goto; ?>" />
     <input type="hidden" name="pos" value="<?php echo isset($pos) ? $pos : 0; ?>" />
@@ -454,7 +454,7 @@ for ($i = 0; $i < $fields_cnt; $i++) {
     // The value column (depends on type)
     // ----------------
 
-    include('./libraries/get_foreign.lib.php3');
+    include('./libraries/get_foreign.lib.php');
 
     if (isset($foreign_link) && $foreign_link == true) {
         ?>
@@ -464,7 +464,7 @@ for ($i = 0; $i < $fields_cnt; $i++) {
         <input type="hidden" name="fields[<?php echo urlencode($field); ?>]" value="" id="field_<?php echo $i; ?>_1" />
         <input type="text"   name="field_<?php echo md5($field); ?>[]" class="textfield" <?php echo $chg_evt_handler; ?>="return unNullify('<?php echo urlencode($field); ?>')" tabindex="<?php echo ($i + 1); ?>" id="field_<?php echo $i; ?>_3" value="<?php echo htmlspecialchars($data); ?>" />
         <script type="text/javascript" language="javascript">
-            document.writeln('<a target="_blank" onclick="window.open(this.href, \'foreigners\', \'width=640,height=240,scrollbars=yes\'); return false" href="browse_foreigners.php3?<?php echo PMA_generate_common_url($db, $table); ?>&amp;field=<?php echo urlencode($field); ?>"><?php echo str_replace("'", "\'", $titles['Browse']); ?></a>');
+            document.writeln('<a target="_blank" onclick="window.open(this.href, \'foreigners\', \'width=640,height=240,scrollbars=yes\'); return false" href="browse_foreigners.php?<?php echo PMA_generate_common_url($db, $table); ?>&amp;field=<?php echo urlencode($field); ?>"><?php echo str_replace("'", "\'", $titles['Browse']); ?></a>');
         </script>
         </td>
         <?php
@@ -781,5 +781,5 @@ if (!empty($disp_message)) {
  * Displays the footer
  */
 echo "\n";
-require('./footer.inc.php3');
+require('./footer.inc.php');
 ?>
diff --git a/tbl_create.php3 b/tbl_create.php
old mode 100755
new mode 100644
similarity index 94%
rename from tbl_create.php3
rename to tbl_create.php
index 4ae29ea63..c16737b39
--- a/tbl_create.php3
+++ b/tbl_create.php
@@ -6,14 +6,14 @@
 /**
  * Get some core libraries
  */
-require('./libraries/grab_globals.lib.php3');
+require('./libraries/grab_globals.lib.php');
 $js_to_run = 'functions.js';
-require('./header.inc.php3');
+require('./header.inc.php');
 
 // Check parameters
 
 if (!defined('PMA_COMMON_LIB_INCLUDED')) {
-    include('./libraries/common.lib.php3');
+    include('./libraries/common.lib.php');
 }
 
 PMA_checkParameters(array('db', 'table'));
@@ -21,7 +21,7 @@ PMA_checkParameters(array('db', 'table'));
 /**
  * Defines the url to return to in case of error in a sql statement
  */
-$err_url = 'tbl_properties.php3?' . PMA_generate_common_url($db, $table);
+$err_url = 'tbl_properties.php?' . PMA_generate_common_url($db, $table);
 
 
 /**
@@ -187,8 +187,8 @@ if (isset($submit)) {
         $message   = $strTable . ' ' . htmlspecialchars($table) . ' ' . $strHasBeenCreated;
 
         // garvin: If comments were sent, enable relation stuff
-        require('./libraries/relation.lib.php3');
-        require('./libraries/transformations.lib.php3');
+        require('./libraries/relation.lib.php');
+        require('./libraries/transformations.lib.php');
 
         $cfgRelation = PMA_getRelationsParam();
 
@@ -215,7 +215,7 @@ if (isset($submit)) {
         PMA_mysqlDie('', '', '', $err_url, FALSE);
         // garvin: An error happened while inserting/updating a table definition.
         // to prevent total loss of that data, we embed the form once again.
-        // The variable $regenerate will be used to restore data in tbl_properties.inc.php3
+        // The variable $regenerate will be used to restore data in tbl_properties.inc.php
         $num_fields = $orig_num_fields;
         $regenerate = true;
     }
@@ -242,11 +242,11 @@ if ($abort == FALSE) {
             PMA_checkReservedWords($table, $err_url);
         }
 
-        $action = 'tbl_create.php3';
-        include('./tbl_properties.inc.php3');
+        $action = 'tbl_create.php';
+        include('./tbl_properties.inc.php');
         // Diplays the footer
         echo "\n";
-        include('./footer.inc.php3');
+        include('./footer.inc.php');
    }
 }
 
diff --git a/tbl_indexes.php3 b/tbl_indexes.php
similarity index 92%
rename from tbl_indexes.php3
rename to tbl_indexes.php
index c679a74b0..2dc7b9334 100644
--- a/tbl_indexes.php3
+++ b/tbl_indexes.php
@@ -7,10 +7,10 @@
  * Gets some core libraries
  */
 if (!defined('PMA_GRAB_GLOBALS_INCLUDED')) {
-    include('./libraries/grab_globals.lib.php3');
+    include('./libraries/grab_globals.lib.php');
 }
 if (!defined('PMA_COMMON_LIB_INCLUDED'))  {
-    include('./libraries/common.lib.php3');
+    include('./libraries/common.lib.php');
 }
 
 
@@ -32,7 +32,7 @@ if (PMA_MYSQL_INT_VERSION >= 32323) {
 /**
  * Ensures the db & table are valid, then loads headers and gets indexes
  * informations.
- * Skipped if this script is called by "tbl_properties.php3"
+ * Skipped if this script is called by "tbl_properties.php"
  */
 if (!defined('PMA_IDX_INCLUDED')) {
     // Not a valid db name -> back to the welcome page
@@ -40,7 +40,7 @@ if (!defined('PMA_IDX_INCLUDED')) {
         $is_db = @PMA_mysql_select_db($db);
     }
     if (empty($db) || !$is_db) {
-        header('Location: ' . $cfg['PmaAbsoluteUri'] . 'main.php3?' . PMA_generate_common_url('', '', '&') . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1');
+        header('Location: ' . $cfg['PmaAbsoluteUri'] . 'main.php?' . PMA_generate_common_url('', '', '&') . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1');
         exit();
     }
     // Not a valid table name -> back to the default db_details sub-page
@@ -57,7 +57,7 @@ if (!defined('PMA_IDX_INCLUDED')) {
 
     // Displays headers (if needed)
     $js_to_run = ((isset($index) && isset($do_save_data)) ? 'functions.js' : 'indexes.js');
-    include('./header.inc.php3');
+    include('./header.inc.php');
 } // end if
 
 
@@ -65,7 +65,7 @@ if (!defined('PMA_IDX_INCLUDED')) {
  * Gets fields and indexes informations
  */
 if (defined('PMA_IDX_INCLUDED')) {
-    $err_url_0 = 'db_details.php3?' . PMA_generate_common_url($db);
+    $err_url_0 = 'db_details.php?' . PMA_generate_common_url($db);
 }
 
 //  Gets table keys and store them in arrays
@@ -73,7 +73,7 @@ $indexes      = array();
 $prev_index   = '';
 $indexes_info = array();
 $indexes_data = array();
-// keys had already been grabbed in "tbl_properties.php3"
+// keys had already been grabbed in "tbl_properties.php"
 if (defined('PMA_IDX_INCLUDED')) {
     $idx_cnt     = count($ret_keys);
 } else {
@@ -116,7 +116,7 @@ if (defined('PMA_IDX_INCLUDED')) {
 }
 
 // Get fields and stores their name/type
-// fields had already been grabbed in "tbl_properties.php3"
+// fields had already been grabbed in "tbl_properties.php"
 if (defined('PMA_IDX_INCLUDED')) {
     mysql_data_seek($fields_rs, 0);
 } else {
@@ -145,12 +145,12 @@ if ($fields_rs) {
 
 /**
  * Do run the query to build the new index and moves back to
- * "tbl_properties.php3"
+ * "tbl_properties.php"
  */
 if (!defined('PMA_IDX_INCLUDED')
     && (isset($index) && isset($do_save_data))) {
 
-    $err_url     = 'tbl_indexes.php3?' . PMA_generate_common_url($db, $table);
+    $err_url     = 'tbl_indexes.php?' . PMA_generate_common_url($db, $table);
     if (empty($old_index)) {
         $err_url .= '&amp;create_index=1&amp;idx_num_fields=' . $idx_num_fields;
     } else {
@@ -212,8 +212,8 @@ if (!defined('PMA_IDX_INCLUDED')
     $result    = PMA_mysql_query($sql_query) or PMA_mysqlDie('', $sql_query, FALSE, $err_url);
     $message   = $strTable . ' ' . htmlspecialchars($table) . ' ' . $strHasBeenAltered;
 
-    $active_page = 'tbl_properties_structure.php3';
-    include('./tbl_properties_structure.php3');
+    $active_page = 'tbl_properties_structure.php';
+    include('./tbl_properties_structure.php');
     exit();
 } // end builds the new index
 
@@ -285,7 +285,7 @@ else if (!defined('PMA_IDX_INCLUDED')
     ?>
 
 <!-- Build index form -->
-<form action="tbl_indexes.php3" method="post" name="index_frm"
+<form action="tbl_indexes.php" method="post" name="index_frm"
     onsubmit="if (typeof(this.elements['index'].disabled) != 'undefined') {this.elements['index'].disabled = false}">
     <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
     <?php
@@ -400,7 +400,7 @@ else if (!defined('PMA_IDX_INCLUDED')
      */
     ?>
     <!-- Indexes form -->
-    <form action="tbl_indexes.php3" method="post">
+    <form action="tbl_indexes.php" method="post">
         <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
     <?php
     echo "\n";
@@ -446,7 +446,7 @@ else if (!defined('PMA_IDX_INCLUDED')
                  . '            </td>' . "\n";
 
             echo $index_td
-                 . '                <a href="tbl_indexes.php3?' . $url_query . '&amp;index=' . urlencode($index_name) . '">' . ($cfg['PropertiesIconic'] ? '<img src="./images/button_edit.png" width="12" height="13" hspace="7" border="0" title="' . $strEdit . '" alt="' . $strEdit . '">' : $strEdit) . '</a>' . "\n"
+                 . '                <a href="tbl_indexes.php?' . $url_query . '&amp;index=' . urlencode($index_name) . '">' . ($cfg['PropertiesIconic'] ? '<img src="./images/button_edit.png" width="12" height="13" hspace="7" border="0" title="' . $strEdit . '" alt="' . $strEdit . '">' : $strEdit) . '</a>' . "\n"
                  . '            </td>' . "\n";
 
             if ($index_name == 'PRIMARY') {
@@ -459,7 +459,7 @@ else if (!defined('PMA_IDX_INCLUDED')
                 $zero_rows = urlencode(sprintf($strIndexHasBeenDropped, htmlspecialchars($index_name)));
             }
             echo $index_td
-                 . '                <a href="sql.php3?' . $url_query . '&amp;sql_query=' . $local_query . '&amp;zero_rows=' . $zero_rows . '" onclick="return confirmLink(this, \'' . $js_msg . '\')">' . ($cfg['PropertiesIconic'] ? '<img src="./images/button_drop.png" width="11" height="12" hspace="7" border="0" title="' . $strDrop . '" alt="' . $strDrop . '">' : $strDrop) . '</a>' . "\n"
+                 . '                <a href="sql.php?' . $url_query . '&amp;sql_query=' . $local_query . '&amp;zero_rows=' . $zero_rows . '" onclick="return confirmLink(this, \'' . $js_msg . '\')">' . ($cfg['PropertiesIconic'] ? '<img src="./images/button_drop.png" width="11" height="12" hspace="7" border="0" title="' . $strDrop . '" alt="' . $strDrop . '">' : $strDrop) . '</a>' . "\n"
                  . '            </td>' . "\n";
 
             while (list($row_no, $seq_index) = each($indexes_info[$index_name]['Sequences'])) {
@@ -509,6 +509,6 @@ else if (!defined('PMA_IDX_INCLUDED')
 echo "\n";
 
 if (!defined('PMA_IDX_INCLUDED')){
-    include('./footer.inc.php3');
+    include('./footer.inc.php');
 }
 ?>
diff --git a/tbl_move_copy.php3 b/tbl_move_copy.php
similarity index 96%
rename from tbl_move_copy.php3
rename to tbl_move_copy.php
index c9af53044..981906cb4 100644
--- a/tbl_move_copy.php3
+++ b/tbl_move_copy.php
@@ -4,10 +4,10 @@
 
 // Check parameters
 
-require('./libraries/grab_globals.lib.php3');
+require('./libraries/grab_globals.lib.php');
 
 if (!defined('PMA_COMMON_LIB_INCLUDED')) {
-    include('./libraries/common.lib.php3');
+    include('./libraries/common.lib.php');
 }
 
 PMA_checkParameters(array('db', 'table'));
@@ -110,14 +110,14 @@ global $cfgRelation;
 /**
  * Gets some core libraries
  */
-require('./libraries/grab_globals.lib.php3');
-require('./libraries/common.lib.php3');
+require('./libraries/grab_globals.lib.php');
+require('./libraries/common.lib.php');
 
 
 /**
  * Defines the url to return to in case of error in a sql statement
  */
-$err_url = 'tbl_properties.php3?' . PMA_generate_common_url($db, $table);
+$err_url = 'tbl_properties.php?' . PMA_generate_common_url($db, $table);
 
 
 /**
@@ -155,7 +155,7 @@ if (isset($new_name) && trim($new_name) != '') {
         
         $target = PMA_backquote($target_db) . '.' . PMA_backquote($new_name);
 
-        include('./libraries/export/sql.php3');
+        include('./libraries/export/sql.php');
 
         $sql_structure = PMA_getTableDef($db, $table, "\n", $err_url);
         $parsed_sql =  PMA_SQP_parse($sql_structure);
@@ -178,7 +178,7 @@ if (isset($new_name) && trim($new_name) != '') {
                 $drop_query = 'DROP TABLE IF EXISTS ' . PMA_backquote($target_db) . '.' . PMA_backquote($new_name);
                 $result        = @PMA_mysql_query($drop_query);
                 if (PMA_mysql_error()) {
-                    include('./header.inc.php3');
+                    include('./header.inc.php');
                     PMA_mysqlDie('', $sql_structure, '', $err_url);
                 }
                 
@@ -195,7 +195,7 @@ if (isset($new_name) && trim($new_name) != '') {
             
             $result        = @PMA_mysql_query($sql_structure);
             if (PMA_mysql_error()) {
-                include('./header.inc.php3');
+                include('./header.inc.php');
                 PMA_mysqlDie('', $sql_structure, '', $err_url);
             } else if (isset($sql_query)) {
                 $sql_query .= "\n" . $sql_structure . ';';
@@ -213,7 +213,7 @@ if (isset($new_name) && trim($new_name) != '') {
                 $sql_insert_data = 'INSERT INTO ' . $target . ' SELECT * FROM ' . $source;
                 $result          = @PMA_mysql_query($sql_insert_data);
                 if (PMA_mysql_error()) {
-                    include('./header.inc.php3');
+                    include('./header.inc.php');
                     PMA_mysqlDie('', $sql_insert_data, '', $err_url);
                 }
             } // end MySQL >= 3.23
@@ -224,7 +224,7 @@ if (isset($new_name) && trim($new_name) != '') {
             $sql_query .= "\n\n" . $sql_insert_data;
         }
 
-        include('./libraries/relation.lib.php3');
+        include('./libraries/relation.lib.php');
         $cfgRelation = PMA_getRelationsParam();
 
         // Drops old table if the user has requested to move it
@@ -237,7 +237,7 @@ if (isset($new_name) && trim($new_name) != '') {
             $sql_drop_table = 'DROP TABLE ' . $source;
             $result         = @PMA_mysql_query($sql_drop_table);
             if (PMA_mysql_error()) {
-                include('./header.inc.php3');
+                include('./header.inc.php');
                 PMA_mysqlDie('', $sql_drop_table, '', $err_url);
             }
 
@@ -419,7 +419,7 @@ if (isset($new_name) && trim($new_name) != '') {
             }
         }
     }
-    include('./header.inc.php3');
+    include('./header.inc.php');
 } // end is target table name
 
 
@@ -427,7 +427,7 @@ if (isset($new_name) && trim($new_name) != '') {
  * No new name for the table!
  */
 else {
-    include('./header.inc.php3');
+    include('./header.inc.php');
     PMA_mysqlDie($strTableEmpty, '', '', $err_url);
 }
 
@@ -436,5 +436,5 @@ else {
  * Back to the calling script
  */
 
-require('./tbl_properties.php3');
+require('./tbl_properties.php');
 ?>
diff --git a/tbl_printview.php3 b/tbl_printview.php
old mode 100755
new mode 100644
similarity index 98%
rename from tbl_printview.php3
rename to tbl_printview.php
index bd69f13fc..8b218c552
--- a/tbl_printview.php3
+++ b/tbl_printview.php
@@ -6,8 +6,8 @@
  * Gets the variables sent or posted to this script, then displays headers
  */
 if (!isset($selected_tbl)) {
-    include('./libraries/grab_globals.lib.php3');
-    include('./header.inc.php3');
+    include('./libraries/grab_globals.lib.php');
+    include('./header.inc.php');
 }
 
 // Check parameters
@@ -19,8 +19,8 @@ if (!isset($the_tables) || !is_array($the_tables)) {
 /**
  * Gets the relations settings
  */
-require('./libraries/relation.lib.php3');
-require('./libraries/transformations.lib.php3');
+require('./libraries/relation.lib.php');
+require('./libraries/transformations.lib.php');
 
 $cfgRelation  = PMA_getRelationsParam();
 
@@ -29,9 +29,9 @@ $cfgRelation  = PMA_getRelationsParam();
  * Defines the url to return to in case of error in a sql statement
  */
 if (isset($table)) {
-    $err_url = 'tbl_properties.php3?' . PMA_generate_common_url($db, $table);
+    $err_url = 'tbl_properties.php?' . PMA_generate_common_url($db, $table);
 } else {
-    $err_url = 'db_details.php3?' . PMA_generate_common_url($db);
+    $err_url = 'db_details.php?' . PMA_generate_common_url($db);
 }
 
 
@@ -642,5 +642,5 @@ function printPage()
 <?php
 echo '<br /><br />&nbsp;<input type="button" style="visibility: ; width: 100px; height: 25px" id="print" value="' . $strPrint . '" onclick="printPage()">' . "\n";
 
-require('./footer.inc.php3');
+require('./footer.inc.php');
 ?>
diff --git a/tbl_properties.inc.php3 b/tbl_properties.inc.php
old mode 100755
new mode 100644
similarity index 97%
rename from tbl_properties.inc.php3
rename to tbl_properties.inc.php
index 33212485c..e6ec5a986
--- a/tbl_properties.inc.php3
+++ b/tbl_properties.inc.php
@@ -5,7 +5,7 @@
 // Check parameters
 
 if (!defined('PMA_COMMON_LIB_INCLUDED')) {
-    include('./libraries/common.lib.php3');
+    include('./libraries/common.lib.php');
 }
 
 PMA_checkParameters(array('db','table','action','num_fields'));
@@ -13,7 +13,7 @@ PMA_checkParameters(array('db','table','action','num_fields'));
 
 // Get available character sets (MySQL >= 4.1)
 if (PMA_MYSQL_INT_VERSION >= 40100 && !defined('PMA_MYSQL_CHARSETS_LIB_INCLUDED')) {
-    include('./libraries/mysql_charsets.lib.php3');
+    include('./libraries/mysql_charsets.lib.php');
 }
 
 ?>
@@ -29,12 +29,12 @@ document.onkeydown = onKeyDownArrowsHandler;
 <form method="post" action="<?php echo $action; ?>" onsubmit="return checkTableEditForm(this, <?php echo $num_fields; ?>)" >
 <?php
 echo PMA_generate_common_hidden_inputs($db, $table);
-if ($action == 'tbl_create.php3') {
+if ($action == 'tbl_create.php') {
     ?>
     <input type="hidden" name="reload" value="1" />
     <?php
 }
-else if ($action == 'tbl_addfield.php3') {
+else if ($action == 'tbl_addfield.php') {
     echo "\n";
     ?>
     <input type="hidden" name="after_field" value="<?php echo $after_field; ?>" />
@@ -84,7 +84,7 @@ if (isset($selected) && is_array($selected)) {
     <?php
 }
 
-$is_backup = ($action != 'tbl_create.php3' && $action != 'tbl_addfield.php3');
+$is_backup = ($action != 'tbl_create.php' && $action != 'tbl_addfield.php');
 
 $header_cells = array();
 $content_cells = array();
@@ -100,8 +100,8 @@ $header_cells[] = $strNull;
 $header_cells[] = $strDefault . '**';
 $header_cells[] = $strExtra;
 
-require('./libraries/relation.lib.php3');
-require('./libraries/transformations.lib.php3');
+require('./libraries/relation.lib.php');
+require('./libraries/transformations.lib.php');
 $cfgRelation = PMA_getRelationsParam();
 
 $comments_map = array();
@@ -408,7 +408,7 @@ for ($i = 0 ; $i < $num_fields; $i++) {
             @reset($available_mime['transformation']);
             while(list($mimekey, $transform) = each($available_mime['transformation'])) {
                 $checked = (isset($row) && isset($row['Field']) && isset($mime_map[$row['Field']]['transformation']) && ($mime_map[$row['Field']]['transformation'] == $available_mime['transformation_file'][$mimekey]) ? 'selected ' : '');
-                $tooltip = 'strTransformation_' . strtolower(str_replace('.inc.php3', '', $available_mime['transformation_file'][$mimekey]));
+                $tooltip = 'strTransformation_' . strtolower(str_replace('.inc.php', '', $available_mime['transformation_file'][$mimekey]));
                 $tooltip = isset($$tooltip) ? $$tooltip : sprintf(str_replace('<br />', ' ', $strMIME_nodescription), 'PMA_transformation_' . $tooltip . '()');
                 $content_cells[$i][$ci] .= '<option value="' . $available_mime['transformation_file'][$mimekey] . '" ' . $checked . ' title="' . $tooltip . '">' . htmlspecialchars($transform) . '</option>' . "\n";
             }
@@ -533,14 +533,14 @@ while(@list($header_nr, $header_val) = @each($header_cells)) {
 <?php
 }
 
-if ($action == 'tbl_create.php3' && PMA_MYSQL_INT_VERSION >= 32300) {
+if ($action == 'tbl_create.php' && PMA_MYSQL_INT_VERSION >= 32300) {
     echo "\n";
     ?>
     <table>
     <tr valign="top">
         <td><?php echo $strTableComments; ?>&nbsp;:</td>
     <?php
-    if ($action == 'tbl_create.php3') {
+    if ($action == 'tbl_create.php') {
         echo "\n";
         ?>
         <td width="25">&nbsp;</td>
@@ -561,7 +561,7 @@ if ($action == 'tbl_create.php3' && PMA_MYSQL_INT_VERSION >= 32300) {
     <?php
     // BEGIN - Table Type - 2 May 2001 - Robbat2
     // change by staybyte - 11 June 2001
-    if ($action == 'tbl_create.php3') {
+    if ($action == 'tbl_create.php') {
         // find mysql capability - staybyte - 11. June 2001
         $query = 'SHOW VARIABLES LIKE \'have_%\'';
         $result = PMA_mysql_query($query);
@@ -663,7 +663,7 @@ if ($cfgRelation['commwork'] && $cfgRelation['mimework'] && $cfg['BrowseMIME'])
 
 <tr>
     <td>
-        <?php echo sprintf($strMIME_transformation_note, '<a href="libraries/transformations/overview.php3?' . PMA_generate_common_url($db, $table) . '" target="_blank">', '</a>') . "\n"; ?>
+        <?php echo sprintf($strMIME_transformation_note, '<a href="libraries/transformations/overview.php?' . PMA_generate_common_url($db, $table) . '" target="_blank">', '</a>') . "\n"; ?>
     </td>
 </tr>
 <?php
diff --git a/tbl_properties.php b/tbl_properties.php
new file mode 100644
index 000000000..d97f21441
--- /dev/null
+++ b/tbl_properties.php
@@ -0,0 +1,39 @@
+<?php
+/* $Id$ */
+// vim: expandtab sw=4 ts=4 sts=4:
+
+
+/**
+ * Runs common work
+ */
+require('./tbl_properties_common.php');
+$err_url   = 'tbl_properties.php' . $err_url;
+$url_query .= '&amp;goto=tbl_properties.php&amp;back=tbl_properties.php';
+
+/**
+ * Top menu
+ */
+require('./tbl_properties_table_info.php');
+
+?>
+<ul>
+
+<!-- TABLE WORK -->
+<?php
+/**
+ * Query box, bookmark, insert data from textfile
+ */
+$goto = 'tbl_properties.php';
+require('./tbl_query_box.php');
+
+?>
+</ul>
+
+<?php
+
+/**
+ * Displays the footer
+ */
+echo "\n";
+require('./footer.inc.php');
+?>
diff --git a/tbl_properties.php3 b/tbl_properties.php3
deleted file mode 100755
index 9aac822e3..000000000
--- a/tbl_properties.php3
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
-
-
-/**
- * Runs common work
- */
-require('./tbl_properties_common.php3');
-$err_url   = 'tbl_properties.php3' . $err_url;
-$url_query .= '&amp;goto=tbl_properties.php3&amp;back=tbl_properties.php3';
-
-/**
- * Top menu
- */
-require('./tbl_properties_table_info.php3');
-
-?>
-<ul>
-
-<!-- TABLE WORK -->
-<?php
-/**
- * Query box, bookmark, insert data from textfile
- */
-$goto = 'tbl_properties.php3';
-require('./tbl_query_box.php3');
-
-?>
-</ul>
-
-<?php
-
-/**
- * Displays the footer
- */
-echo "\n";
-require('./footer.inc.php3');
-?>
diff --git a/tbl_properties_common.php3 b/tbl_properties_common.php
old mode 100755
new mode 100644
similarity index 79%
rename from tbl_properties_common.php3
rename to tbl_properties_common.php
index 4d64327be..c278da3c7
--- a/tbl_properties_common.php3
+++ b/tbl_properties_common.php
@@ -7,13 +7,13 @@
  * Gets some core libraries
  */
 if (!defined('PMA_GRAB_GLOBALS_INCLUDED')) {
-    include('./libraries/grab_globals.lib.php3');
+    include('./libraries/grab_globals.lib.php');
 }
 if (!defined('PMA_COMMON_LIB_INCLUDED')) {
-    include('./libraries/common.lib.php3');
+    include('./libraries/common.lib.php');
 }
 if (!defined('PMA_BOOKMARK_LIB_INCLUDED')) {
-    include('./libraries/bookmark.lib.php3');
+    include('./libraries/bookmark.lib.php');
 }
 
 // Check parameters
@@ -29,7 +29,7 @@ $err_url   = $cfg['DefaultTabTable'] . '?' . PMA_generate_common_url($db, $table
 /**
  * Ensures the database and the table exist (else move to the "parent" script)
  */
-require('./libraries/db_table_exists.lib.php3');
+require('./libraries/db_table_exists.lib.php');
 
 
 /**
@@ -37,7 +37,7 @@ require('./libraries/db_table_exists.lib.php3');
  */
 if (!isset($message)) {
     $js_to_run = 'functions.js';
-    include('./header.inc.php3');
+    include('./header.inc.php');
 } else {
     PMA_showMessage($message);
     unset($message);
diff --git a/tbl_properties_export.php3 b/tbl_properties_export.php
old mode 100755
new mode 100644
similarity index 82%
rename from tbl_properties_export.php3
rename to tbl_properties_export.php
index 3f1b4f0bc..c1c091c2a
--- a/tbl_properties_export.php3
+++ b/tbl_properties_export.php
@@ -6,9 +6,9 @@
 /**
  * Gets tables informations and displays top links
  */
-require('./tbl_properties_common.php3');
-$url_query .= '&amp;goto=tbl_properties_export.php3&amp;back=tbl_properties_export.php3';
-require('./tbl_properties_table_info.php3');
+require('./tbl_properties_common.php');
+$url_query .= '&amp;goto=tbl_properties_export.php&amp;back=tbl_properties_export.php';
+require('./tbl_properties_table_info.php');
 ?>
 
 <!-- Dump of a table -->
@@ -20,7 +20,7 @@ require('./tbl_properties_table_info.php3');
 if (isset($sql_query)) {
     // I don't want the LIMIT clause, so I use the analyzer
     // to reconstruct the query with only some parts
-    // because the LIMIT clause may come from us (sql.php3, sql_limit_to_append
+    // because the LIMIT clause may come from us (sql.php, sql_limit_to_append
     // or may come from the user.
     // Then, the limits set in the form will be added.
     // TODO: do we need some other parts here, like PROCEDURE or FOR UPDATE?
@@ -56,11 +56,11 @@ if (isset($sql_query)) {
 }
 
 $export_type = 'table';
-require('./libraries/display_export.lib.php3');
+require('./libraries/display_export.lib.php');
 
 
 /**
  * Displays the footer
  */
-require('./footer.inc.php3');
+require('./footer.inc.php');
 ?>
diff --git a/tbl_properties_links.php3 b/tbl_properties_links.php
old mode 100755
new mode 100644
similarity index 80%
rename from tbl_properties_links.php3
rename to tbl_properties_links.php
index bb6a10155..24f527110
--- a/tbl_properties_links.php3
+++ b/tbl_properties_links.php
@@ -13,7 +13,7 @@
 // Check parameters
 
 if (!defined('PMA_COMMON_LIB_INCLUDED')) {
-    include('./libraries/common.lib.php3');
+    include('./libraries/common.lib.php');
 }
 
 PMA_checkParameters(array('db'));
@@ -27,20 +27,20 @@ $db_details_links_count_tabs = 0;
 /**
  * Prepares links
  */
-include('./libraries/bookmark.lib.php3');
+include('./libraries/bookmark.lib.php');
 $book_sql_query = PMA_queryBookmarks($db, $cfg['Bookmark'], '\'' . PMA_sqlAddslashes($table) . '\'', 'label');
 
 if ($table_info_num_rows > 0) {
-    $lnk2    = 'sql.php3';
+    $lnk2    = 'sql.php';
     $arg2    = $url_query
              . '&amp;sql_query=' . (isset($book_sql_query) && $book_sql_query != FALSE ? urlencode($book_sql_query) : urlencode('SELECT * FROM ' . PMA_backquote($table)))
              . '&amp;pos=0';
-    $lnk4    = 'tbl_select.php3';
+    $lnk4    = 'tbl_select.php';
     $arg4    = $url_query;
     $ln6_stt = (PMA_MYSQL_INT_VERSION >= 40000)
              ? 'TRUNCATE TABLE '
              : 'DELETE FROM ';
-    $lnk6    = 'sql.php3';
+    $lnk6    = 'sql.php';
     $arg6    = $url_query . '&amp;sql_query='
              . urlencode($ln6_stt . PMA_backquote($table))
              .  '&amp;zero_rows='
@@ -72,15 +72,15 @@ if ($cfg['LightTabs']) {
         <td width="8">&nbsp;</td>';
 }
 
-echo PMA_printTab($strStructure, 'tbl_properties_structure.php3', $url_query);
+echo PMA_printTab($strStructure, 'tbl_properties_structure.php', $url_query);
 echo PMA_printTab($strBrowse, $lnk2, $arg2);
-echo PMA_printTab($strSQL, 'tbl_properties.php3', $url_query);
+echo PMA_printTab($strSQL, 'tbl_properties.php', $url_query);
 echo PMA_printTab($strSearch, $lnk4, $arg4);
-echo PMA_printTab($strInsert, 'tbl_change.php3', $url_query);
-echo PMA_printTab($strExport, 'tbl_properties_export.php3', $url_query . '&amp;single_table=true');
-echo PMA_printTab($strOperations, 'tbl_properties_operations.php3', $url_query);
+echo PMA_printTab($strInsert, 'tbl_change.php', $url_query);
+echo PMA_printTab($strExport, 'tbl_properties_export.php', $url_query . '&amp;single_table=true');
+echo PMA_printTab($strOperations, 'tbl_properties_operations.php', $url_query);
 echo PMA_printTab($strEmpty, $lnk6, $arg6, $att6);
-echo PMA_printTab($strDrop, 'sql.php3', $arg7, $att7);
+echo PMA_printTab($strDrop, 'sql.php', $arg7, $att7);
 echo "\n";
 
 if (!$cfg['LightTabs']) {
diff --git a/tbl_properties_operations.php3 b/tbl_properties_operations.php
old mode 100755
new mode 100644
similarity index 92%
rename from tbl_properties_operations.php3
rename to tbl_properties_operations.php
index f286ab2ea..874121d63
--- a/tbl_properties_operations.php3
+++ b/tbl_properties_operations.php
@@ -6,22 +6,22 @@
 /**
  * Runs common work
  */
-require('./tbl_properties_common.php3');
-//$err_url   = 'tbl_properties_operations.php3' . $err_url;
-$url_query .= '&amp;goto=tbl_properties_operations.php3&amp;back=tbl_properties_operations.php3';
+require('./tbl_properties_common.php');
+//$err_url   = 'tbl_properties_operations.php' . $err_url;
+$url_query .= '&amp;goto=tbl_properties_operations.php&amp;back=tbl_properties_operations.php';
 
 
 /**
  * Gets relation settings
  */
-require('./libraries/relation.lib.php3');
+require('./libraries/relation.lib.php');
 $cfgRelation = PMA_getRelationsParam();
 
 /**
  * Gets available MySQL charsets
  */
 if (PMA_MYSQL_INT_VERSION >= 40100 && !defined('PMA_MYSQL_CHARSETS_LIB_INCLUDED')) {
-    include('./libraries/mysql_charsets.lib.php3');
+    include('./libraries/mysql_charsets.lib.php');
 }
 
 /**
@@ -75,7 +75,7 @@ if (isset($submitorderby) && !empty($order_field)) {
 /**
  * Gets tables informations and displays top links
  */
-require('./tbl_properties_table_info.php3');
+require('./tbl_properties_table_info.php');
 
 
 /**
@@ -100,7 +100,7 @@ if (PMA_MYSQL_INT_VERSION >= 32334) {
     ?>
     <!-- Order the table -->
     <li>
-        <form method="post" action="tbl_properties_operations.php3">
+        <form method="post" action="tbl_properties_operations.php">
             <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
             <?php echo $strAlterOrderBy; ?>&nbsp;:
             <select name="order_field" style="vertical-align: middle">
@@ -124,7 +124,7 @@ echo "\n";
 
     <!-- Change table name -->
     <li>
-        <form method="post" action="tbl_rename.php3"
+        <form method="post" action="tbl_rename.php"
             onsubmit="return emptyFormElements(this, 'new_name')">
             <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
             <input type="hidden" name="reload" value="1" />
@@ -137,7 +137,7 @@ echo "\n";
     <!-- Move table -->
     <li>
         <?php echo $strMoveTable . "\n"; ?>
-        <form method="post" action="tbl_move_copy.php3"
+        <form method="post" action="tbl_move_copy.php"
             onsubmit="return emptyFormElements(this, 'new_name')">
             <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
             <input type="hidden" name="reload" value="1" />
@@ -147,8 +147,8 @@ echo "\n";
                 <td>
                     <select name="target_db">
 <?php
-// The function used below is defined in "common.lib.php3"
-PMA_availableDatabases('main.php3?' . PMA_generate_common_url());
+// The function used below is defined in "common.lib.php"
+PMA_availableDatabases('main.php?' . PMA_generate_common_url());
 for ($i = 0; $i < $num_dbs; $i++) {
     echo '                            ';
     echo '<option value="' . htmlspecialchars($dblist[$i]) . '">' . htmlspecialchars($dblist[$i]) . '</option>';
@@ -172,7 +172,7 @@ for ($i = 0; $i < $num_dbs; $i++) {
     <!-- Copy table -->
     <li>
         <?php echo $strCopyTable . "\n"; ?>
-        <form method="post" action="tbl_move_copy.php3"
+        <form method="post" action="tbl_move_copy.php"
             onsubmit="return emptyFormElements(this, 'new_name')">
             <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
             <input type="hidden" name="reload" value="1" />
@@ -237,7 +237,7 @@ if (PMA_MYSQL_INT_VERSION >= 32322) {
         if ($tbl_type == 'MYISAM' || $tbl_type == 'INNODB') {
             ?>
             <li>
-                <a href="sql.php3?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('CHECK TABLE ' . PMA_backquote($table)); ?>">
+                <a href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('CHECK TABLE ' . PMA_backquote($table)); ?>">
                     <?php echo $strCheckTable; ?></a>&nbsp;
                 <?php echo PMA_showMySQLDocu('MySQL_Database_Administration', 'CHECK_TABLE') . "\n"; ?>
             </li>
@@ -247,7 +247,7 @@ if (PMA_MYSQL_INT_VERSION >= 32322) {
         if ($tbl_type == 'MYISAM' || $tbl_type == 'BERKELEYDB') {
             ?>
             <li>
-                <a href="sql.php3?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('ANALYZE TABLE ' . PMA_backquote($table)); ?>">
+                <a href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('ANALYZE TABLE ' . PMA_backquote($table)); ?>">
                     <?php echo $strAnalyzeTable; ?></a>&nbsp;
                 <?php echo PMA_showMySQLDocu('MySQL_Database_Administration', 'ANALYZE_TABLE') . "\n";?>
             </li>
@@ -257,7 +257,7 @@ if (PMA_MYSQL_INT_VERSION >= 32322) {
         if ($tbl_type == 'MYISAM') {
             ?>
             <li>
-                <a href="sql.php3?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('REPAIR TABLE ' . PMA_backquote($table)); ?>">
+                <a href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('REPAIR TABLE ' . PMA_backquote($table)); ?>">
                     <?php echo $strRepairTable; ?></a>&nbsp;
                 <?php echo PMA_showMySQLDocu('MySQL_Database_Administration', 'REPAIR_TABLE') . "\n"; ?>
             </li>
@@ -267,7 +267,7 @@ if (PMA_MYSQL_INT_VERSION >= 32322) {
         if ($tbl_type == 'MYISAM' || $tbl_type == 'BERKELEYDB') {
             ?>
             <li>
-                <a href="sql.php3?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('OPTIMIZE TABLE ' . PMA_backquote($table)); ?>">
+                <a href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('OPTIMIZE TABLE ' . PMA_backquote($table)); ?>">
                     <?php echo $strOptimizeTable; ?></a>&nbsp;
                 <?php echo PMA_showMySQLDocu('MySQL_Database_Administration', 'OPTIMIZE_TABLE') . "\n"; ?>
             </li>
@@ -286,7 +286,7 @@ else if (PMA_MYSQL_INT_VERSION >= 32306
          && ($tbl_type == 'MYISAM' or $tbl_type == 'BERKELEYDB')) {
     ?>
             <li>
-                <a href="sql.php3?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('OPTIMIZE TABLE ' . PMA_backquote($table)); ?>">
+                <a href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('OPTIMIZE TABLE ' . PMA_backquote($table)); ?>">
                 <?php echo $strOptimizeTable; ?></a>&nbsp;
                 <?php echo PMA_showMySQLDocu('MySQL_Database_Administration', 'OPTIMIZE_TABLE') . "\n"; ?>
             </li>
@@ -295,7 +295,7 @@ else if (PMA_MYSQL_INT_VERSION >= 32306
 } // end 3.23.06 < MySQL < 3.23.22
     ?>
             <li>
-                <a href="sql.php3?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('FLUSH TABLE ' . PMA_backquote($table)); ?>&amp;zero_rows=<?php echo urlencode(sprintf($strTableHasBeenFlushed, htmlspecialchars($table))); if ($cfg['ShowTooltip']) echo '&amp;reload=1'; ?>">
+                <a href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('FLUSH TABLE ' . PMA_backquote($table)); ?>&amp;zero_rows=<?php echo urlencode(sprintf($strTableHasBeenFlushed, htmlspecialchars($table))); if ($cfg['ShowTooltip']) echo '&amp;reload=1'; ?>">
                     <?php echo $strFlushTable; ?></a>&nbsp;
                     <?php echo PMA_showMySQLDocu('MySQL_Database_Administration', 'FLUSH') . "\n"; ?>
             </li>
@@ -341,7 +341,7 @@ if ($cfgRelation['relwork'] && $tbl_type != "INNODB") {
                                  . PMA_backquote($table) . '.' . PMA_backquote($master)
                                  . ' IS NOT NULL';
                     echo '        '
-                         . '<a href="sql.php3?' . $url_query
+                         . '<a href="sql.php?' . $url_query
                          . '&amp;sql_query='
                          . urlencode($join_query)
                          . '">' . $master . '&nbsp;->&nbsp;' . $arr['foreign_table'] . '.' . $arr['foreign_field']
@@ -370,7 +370,7 @@ if (PMA_MYSQL_INT_VERSION >= 32322) {
     ?>
     <!-- Table comments -->
     <li>
-        <form method="post" action="tbl_properties_operations.php3">
+        <form method="post" action="tbl_properties_operations.php">
             <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
             <?php echo $strTableComments; ?>&nbsp;:&nbsp;
             <?php $comment = ereg_replace('; InnoDB free:.*$' , '', ereg_replace('^InnoDB free:.*$', '', $show_comment)); ?>
@@ -418,7 +418,7 @@ if (PMA_MYSQL_INT_VERSION >= 32322) {
     echo "\n";
     ?>
     <li>
-        <form method="post" action="tbl_properties_operations.php3">
+        <form method="post" action="tbl_properties_operations.php">
             <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
             <?php echo $strTableType; ?>&nbsp;:&nbsp;
             <select name="tbl_type" style="vertical-align: middle">
@@ -461,7 +461,7 @@ if (PMA_MYSQL_INT_VERSION >= 32322) {
         echo "\n"
            . '<!-- Table character set -->' . "\n"
            . '    <li>' . "\n"
-           . '        <form method="post" action="tbl_properties_operations.php3">' . "\n"
+           . '        <form method="post" action="tbl_properties_operations.php">' . "\n"
            . PMA_generate_common_hidden_inputs($db, $table, 3)
            . '            ' . $strCharset . '&nbsp;:&nbsp;' . "\n"
            . '            <select name="tbl_charset" style="vertical-align: middle">' . "\n";
@@ -485,7 +485,7 @@ if (PMA_MYSQL_INT_VERSION >= 32322) {
         <table border="0" cellspacing="0" cellpadding="0">
         <tr>
             <td valign="top">
-                <form method="post" action="tbl_properties_operations.php3">
+                <form method="post" action="tbl_properties_operations.php">
                     <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
 
                     <table border="0" cellspacing="1" cellpadding="1">
@@ -523,5 +523,5 @@ if (PMA_MYSQL_INT_VERSION >= 32322) {
  * Displays the footer
  */
 echo "\n";
-require('./footer.inc.php3');
+require('./footer.inc.php');
 ?>
diff --git a/tbl_properties_structure.php3 b/tbl_properties_structure.php
old mode 100755
new mode 100644
similarity index 90%
rename from tbl_properties_structure.php3
rename to tbl_properties_structure.php
index 7625d9c3b..5eebeec10
--- a/tbl_properties_structure.php3
+++ b/tbl_properties_structure.php
@@ -3,13 +3,13 @@
 // vim: expandtab sw=4 ts=4 sts=4:
 
 if (!defined('PMA_GRAB_GLOBALS_INCLUDED')) {
-    include('./libraries/grab_globals.lib.php3');
+    include('./libraries/grab_globals.lib.php');
 }
 if (!defined('PMA_COMMON_LIB_INCLUDED')) {
-    include('./libraries/common.lib.php3');
+    include('./libraries/common.lib.php');
 }
 if (PMA_MYSQL_INT_VERSION >= 40100 && !defined('PMA_MYSQL_CHARSETS_LIB_INCLUDED')) {
-    include('./libraries/mysql_charsets.lib.php3');
+    include('./libraries/mysql_charsets.lib.php');
 }
 
 /**
@@ -26,22 +26,22 @@ if (isset($submit_mult_drop_x)) {
 
 if ((!empty($submit_mult) && isset($selected_fld))
     || isset($mult_btn)) {
-    $action = 'tbl_properties_structure.php3';
-    $err_url = 'tbl_properties_structure.php3?' . PMA_generate_common_url($db, $table);
-    include('./mult_submits.inc.php3');
+    $action = 'tbl_properties_structure.php';
+    $err_url = 'tbl_properties_structure.php?' . PMA_generate_common_url($db, $table);
+    include('./mult_submits.inc.php');
 }
 
 /**
  * Runs common work
  */
-require('./tbl_properties_common.php3');
-$url_query .= '&amp;goto=tbl_properties_structure.php3&amp;back=tbl_properties_structure.php3';
+require('./tbl_properties_common.php');
+$url_query .= '&amp;goto=tbl_properties_structure.php&amp;back=tbl_properties_structure.php';
 
 /**
  * Prepares the table structure display
  */
 // 1. Get table information/display tabs
-require('./tbl_properties_table_info.php3');
+require('./tbl_properties_table_info.php');
 
 /**
  * Show result of multi submit operation
@@ -81,7 +81,7 @@ $fields_cnt  = mysql_num_rows($fields_rs);
 
 <!-- TABLE INFORMATIONS -->
 
-<form method="post" action="tbl_properties_structure.php3" name="fieldsForm">
+<form method="post" action="tbl_properties_structure.php" name="fieldsForm">
     <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
 
 <table border="<?php echo $cfg['Border']; ?>">
@@ -102,8 +102,8 @@ $comments_map = array();
 $mime_map = array();
 
 if ($GLOBALS['cfg']['ShowPropertyComments']) {
-    require('./libraries/relation.lib.php3');
-    require('./libraries/transformations.lib.php3');
+    require('./libraries/relation.lib.php');
+    require('./libraries/transformations.lib.php');
 
     $cfgRelation = PMA_getRelationsParam();
 
@@ -279,7 +279,7 @@ while ($row = PMA_mysql_fetch_array($fields_rs)) {
     <td bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap"><?php if (isset($row['Default'])) echo $row['Default']; ?>&nbsp;</td>
     <td bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap"><?php echo $row['Extra']; ?>&nbsp;</td>
     <td align="center" bgcolor="<?php echo $bgcolor; ?>">
-        <a href="tbl_alter.php3?<?php echo $url_query; ?>&amp;field=<?php echo $field_encoded; ?>">
+        <a href="tbl_alter.php?<?php echo $url_query; ?>&amp;field=<?php echo $field_encoded; ?>">
             <?php echo $titles['Change']; ?></a>
     </td>
     <td align="center" bgcolor="<?php echo $bgcolor; ?>">
@@ -288,7 +288,7 @@ while ($row = PMA_mysql_fetch_array($fields_rs)) {
         if ($fields_cnt > 1) {
             echo "\n";
             ?>
-        <a href="sql.php3?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' DROP ' . PMA_backquote($row['Field'])); ?>&amp;cpurge=1&amp;purgekey=<?php echo urlencode($row['Field']); ?>&amp;zero_rows=<?php echo urlencode(sprintf($strFieldHasBeenDropped, htmlspecialchars($row['Field']))); ?>"
+        <a href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' DROP ' . PMA_backquote($row['Field'])); ?>&amp;cpurge=1&amp;purgekey=<?php echo urlencode($row['Field']); ?>&amp;zero_rows=<?php echo urlencode(sprintf($strFieldHasBeenDropped, htmlspecialchars($row['Field']))); ?>"
             onclick="return confirmLink(this, 'ALTER TABLE <?php echo PMA_jsFormat($table); ?> DROP <?php echo PMA_jsFormat($row['Field']); ?>')">
             <?php echo $titles['Drop']; ?></a>
             <?php
@@ -305,7 +305,7 @@ while ($row = PMA_mysql_fetch_array($fields_rs)) {
         } else {
             echo "\n";
             ?>
-        <a href="sql.php3?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' DROP PRIMARY KEY, ADD PRIMARY KEY(' . $primary . PMA_backquote($row['Field']) . ')'); ?>&amp;zero_rows=<?php echo urlencode(sprintf($strAPrimaryKey, htmlspecialchars($row['Field']))); ?>"
+        <a href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' DROP PRIMARY KEY, ADD PRIMARY KEY(' . $primary . PMA_backquote($row['Field']) . ')'); ?>&amp;zero_rows=<?php echo urlencode(sprintf($strAPrimaryKey, htmlspecialchars($row['Field']))); ?>"
             onclick="return confirmLink(this, 'ALTER TABLE <?php echo PMA_jsFormat($table); ?> DROP PRIMARY KEY, ADD PRIMARY KEY(<?php echo PMA_jsFormat($row['Field']); ?>)')">
             <?php echo $titles['Primary']; ?></a>
             <?php
@@ -320,7 +320,7 @@ while ($row = PMA_mysql_fetch_array($fields_rs)) {
         } else {
             echo "\n";
             ?>
-        <a href="sql.php3?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD INDEX(' . PMA_backquote($row['Field']) . ')'); ?>&amp;zero_rows=<?php echo urlencode(sprintf($strAnIndex ,htmlspecialchars($row['Field']))); ?>">
+        <a href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD INDEX(' . PMA_backquote($row['Field']) . ')'); ?>&amp;zero_rows=<?php echo urlencode(sprintf($strAnIndex ,htmlspecialchars($row['Field']))); ?>">
             <?php echo $titles['Index']; ?></a>
             <?php
         }
@@ -334,7 +334,7 @@ while ($row = PMA_mysql_fetch_array($fields_rs)) {
         } else {
             echo "\n";
             ?>
-        <a href="sql.php3?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD UNIQUE(' . PMA_backquote($row['Field']) . ')'); ?>&amp;zero_rows=<?php echo urlencode(sprintf($strAnIndex , htmlspecialchars($row['Field']))); ?>">
+        <a href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD UNIQUE(' . PMA_backquote($row['Field']) . ')'); ?>&amp;zero_rows=<?php echo urlencode(sprintf($strAnIndex , htmlspecialchars($row['Field']))); ?>">
             <?php echo $titles['Unique']; ?></a>
             <?php
         }
@@ -348,7 +348,7 @@ while ($row = PMA_mysql_fetch_array($fields_rs)) {
             echo "\n";
             ?>
     <td align="center" bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap">
-        <a href="sql.php3?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD FULLTEXT(' . PMA_backquote($row['Field']) . ')'); ?>&amp;zero_rows=<?php echo urlencode(sprintf($strAnIndex , htmlspecialchars($row['Field']))); ?>">
+        <a href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD FULLTEXT(' . PMA_backquote($row['Field']) . ')'); ?>&amp;zero_rows=<?php echo urlencode(sprintf($strAnIndex , htmlspecialchars($row['Field']))); ?>">
             <?php echo $titles['IdxFulltext']; ?></a>
     </td>
             <?php
@@ -370,7 +370,7 @@ while ($row = PMA_mysql_fetch_array($fields_rs)) {
 
 echo "\n";
 
-$checkall_url = 'tbl_properties_structure.php3?' . PMA_generate_common_url($db,$table);
+$checkall_url = 'tbl_properties_structure.php?' . PMA_generate_common_url($db,$table);
 ?>
 
 <tr>
@@ -440,7 +440,7 @@ if ($fields_cnt > 20) {
 <!-- Browse links -->
     <?php
     echo "\n";
-    include('./tbl_properties_links.php3');
+    include('./tbl_properties_links.php');
 } // end if ($fields_cnt > 20)
 echo "\n\n";
 
@@ -456,7 +456,7 @@ echo "\n\n";
     <td valign="top">
 <?php
 define('PMA_IDX_INCLUDED', 1);
-require ('./tbl_indexes.php3');
+require ('./tbl_indexes.php');
 ?>
     </td>
 
@@ -555,7 +555,7 @@ if ($cfg['ShowStats']) {
             ?>
         <tr>
             <td colspan="3" align="center">
-                [<a href="sql.php3?<?php echo $url_query; ?>&amp;pos=0&amp;sql_query=<?php echo urlencode('OPTIMIZE TABLE ' . PMA_backquote($table)); ?>"><?php echo $strOptimizeTable; ?></a>]
+                [<a href="sql.php?<?php echo $url_query; ?>&amp;pos=0&amp;sql_query=<?php echo urlencode('OPTIMIZE TABLE ' . PMA_backquote($table)); ?>"><?php echo $strOptimizeTable; ?></a>]
             </td>
         </tr>
             <?php
@@ -728,12 +728,12 @@ echo "\n";
 
     <!-- Printable view of the table -->
     <li>
-        <div style="margin-bottom: 10px"><a href="tbl_printview.php3?<?php echo $url_query; ?>"><?php echo $strPrintView; ?></a></div>
+        <div style="margin-bottom: 10px"><a href="tbl_printview.php?<?php echo $url_query; ?>"><?php echo $strPrintView; ?></a></div>
     </li>
 
     <!-- Add some new fields -->
     <li>
-        <form method="post" action="tbl_addfield.php3"
+        <form method="post" action="tbl_addfield.php"
             onsubmit="return checkFormElementInRange(this, 'num_fields', 1)">
             <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
             <?php echo $strAddNewField; ?>&nbsp;:
@@ -759,7 +759,7 @@ if ($cfg['Server']['relation']) {
     <!-- Work on Relations -->
     <li>
         <div style="margin-bottom: 10px">
-            <a href="tbl_relation.php3?<?php echo $url_query; ?>"><?php echo $strRelationView; ?></a>
+            <a href="tbl_relation.php?<?php echo $url_query; ?>"><?php echo $strRelationView; ?></a>
         </div>
     </li>
     <?php
@@ -770,7 +770,7 @@ echo "\n";
     <!-- Let MySQL propose the optimal structure -->
     <li>
         <div style="margin-bottom: 10px">
-        <a href="sql.php3?<?php echo $url_query; ?>&amp;session_max_rows=all&amp;sql_query=<?php echo urlencode('SELECT * FROM ' . PMA_backquote($table) . ' PROCEDURE ANALYSE()'); ?>">
+        <a href="sql.php?<?php echo $url_query; ?>&amp;session_max_rows=all&amp;sql_query=<?php echo urlencode('SELECT * FROM ' . PMA_backquote($table) . ' PROCEDURE ANALYSE()'); ?>">
             <?php echo $strStructPropose; ?></a>
         <?php echo PMA_showMySQLDocu('Extending_MySQL', 'procedure_analyse') . "\n"; ?>
         </div>
@@ -780,8 +780,8 @@ echo "\n";
 /**
  * Query box, bookmark, insert data from textfile
  */
-$goto = 'tbl_properties_structure.php3';
-require('./tbl_query_box.php3');
+$goto = 'tbl_properties_structure.php';
+require('./tbl_query_box.php');
 ?>
 
 </ul>
@@ -792,5 +792,5 @@ require('./tbl_query_box.php3');
  * Displays the footer
  */
 echo "\n";
-require('./footer.inc.php3');
+require('./footer.inc.php');
 ?>
diff --git a/tbl_properties_table_info.php3 b/tbl_properties_table_info.php
old mode 100755
new mode 100644
similarity index 96%
rename from tbl_properties_table_info.php3
rename to tbl_properties_table_info.php
index 0c206c338..37704c551
--- a/tbl_properties_table_info.php3
+++ b/tbl_properties_table_info.php
@@ -8,7 +8,7 @@
 // Check parameters
 
 if (!defined('PMA_COMMON_LIB_INCLUDED')) {
-    include('./libraries/common.lib.php3');
+    include('./libraries/common.lib.php');
 }
 
 PMA_checkParameters(array('db', 'table'));
@@ -51,7 +51,7 @@ mysql_free_result($table_info_result);
  * Displays top menu links
  */
 echo '<!-- top menu -->' . "\n";
-require('./tbl_properties_links.php3');
+require('./tbl_properties_links.php');
 
 
 /**
diff --git a/tbl_query_box.php3 b/tbl_query_box.php
old mode 100755
new mode 100644
similarity index 95%
rename from tbl_query_box.php3
rename to tbl_query_box.php
index 82a5e676b..a3d3586b4
--- a/tbl_query_box.php3
+++ b/tbl_query_box.php
@@ -5,10 +5,10 @@
 // Check parameters
 
 if (!defined('PMA_COMMON_LIB_INCLUDED')) {
-    include('./libraries/common.lib.php3');
+    include('./libraries/common.lib.php');
 }
 if (!defined('PMA_BOOKMARK_LIB_INCLUDED')) {
-    include('./libraries/bookmark.lib.php3');
+    include('./libraries/bookmark.lib.php');
 }
 
 if (!($cfg['QueryFrame'] && $cfg['QueryFrameJS'] && isset($is_inside_querywindow) && $is_inside_querywindow == TRUE && isset($querydisplay_tab) && ($querydisplay_tab == 'sql' || $querydisplay_tab == 'full'))) {
@@ -19,7 +19,7 @@ if (!($cfg['QueryFrame'] && $cfg['QueryFrameJS'] && isset($is_inside_querywindow
  * Defines the query to be displayed in the query textarea
  */
 if (isset($show_query) && $show_query == '1') {
-    // This script has been called by read_dump.php3
+    // This script has been called by read_dump.php
     if (isset($sql_query_cpy)) {
         $query_to_display = $sql_query_cpy;
     }
@@ -55,7 +55,7 @@ else {
  * Work on the table
  */
 // loic1: defines wether file upload is available or not
-// ($is_upload now defined in common.lib.php3)
+// ($is_upload now defined in common.lib.php)
 
 if ($cfg['QueryFrame'] && $cfg['QueryFrameJS'] && isset($is_inside_querywindow) && $is_inside_querywindow == TRUE && isset($querydisplay_tab) && ($querydisplay_tab == 'sql' || $querydisplay_tab == 'full')) {
     $locking   = 'onKeyPress="document.sqlform.elements[\'LockFromUpdate\'].checked = true;"';
@@ -79,7 +79,7 @@ if ($cfg['QueryFrame'] && (!$cfg['QueryFrameJS'] && !$db || ($cfg['QueryFrameJS'
      * Get the list and number of available databases.
      */
     if ($server > 0) {
-        PMA_availableDatabases(); // this function is defined in "common.lib.php3"
+        PMA_availableDatabases(); // this function is defined in "common.lib.php"
     } else {
         $num_dbs = 0;
     }
@@ -104,16 +104,16 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS'] && isset($is_inside_querywindow)
 ?>
         <script type="text/javascript">
         <!--
-        document.writeln('<form method="post" target="phpmain' +  <?php echo ((isset($is_inside_querywindow) && $is_inside_querywindow == TRUE) ? 'opener.' : '');?>parent.frames.queryframe.document.hashform.hash.value + '" action="read_dump.php3"<?php if ($is_upload) echo ' enctype="multipart/form-data"'; ?> onsubmit="return checkSqlQuery(this)" name="sqlform">');
+        document.writeln('<form method="post" target="phpmain' +  <?php echo ((isset($is_inside_querywindow) && $is_inside_querywindow == TRUE) ? 'opener.' : '');?>parent.frames.queryframe.document.hashform.hash.value + '" action="read_dump.php"<?php if ($is_upload) echo ' enctype="multipart/form-data"'; ?> onsubmit="return checkSqlQuery(this)" name="sqlform">');
         //-->
         </script>
         <noscript>
-            <form method="post" target="phpmain<?php echo md5($cfg['PmaAbsoluteUri']); ?>" action="read_dump.php3"<?php if ($is_upload) echo ' enctype="multipart/form-data"'; ?> name="sqlform">
+            <form method="post" target="phpmain<?php echo md5($cfg['PmaAbsoluteUri']); ?>" action="read_dump.php"<?php if ($is_upload) echo ' enctype="multipart/form-data"'; ?> name="sqlform">
         </noscript>
 <?php
 } else {
 ?>
-        <form method="post" action="read_dump.php3"<?php if ($is_upload) echo ' enctype="multipart/form-data"'; ?> onsubmit="return checkSqlQuery(this)" name="sqlform">
+        <form method="post" action="read_dump.php"<?php if ($is_upload) echo ' enctype="multipart/form-data"'; ?> onsubmit="return checkSqlQuery(this)" name="sqlform">
 <?php
 }
 ?>
@@ -385,7 +385,7 @@ if (!isset($is_inside_querywindow) ||
     (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE && isset($querydisplay_tab) && ($querydisplay_tab == 'files' || $querydisplay_tab == 'full')) && isset($db) && $db != '') {
 
     // loic1: displays import dump feature only if file upload available
-    $ldi_target = 'ldi_table.php3?' . $url_query . (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE ? '&amp;focus_querywindow=true' : '');
+    $ldi_target = 'ldi_table.php?' . $url_query . (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE ? '&amp;focus_querywindow=true' : '');
 
     if ($is_upload && isset($db) && isset($table)) {
         ?>
diff --git a/tbl_relation.php3 b/tbl_relation.php
similarity index 97%
rename from tbl_relation.php3
rename to tbl_relation.php
index d771d5d4b..80ba411f0 100644
--- a/tbl_relation.php3
+++ b/tbl_relation.php
@@ -5,17 +5,17 @@
 /**
  * Gets some core libraries
  */
-require('./libraries/grab_globals.lib.php3');
-require('./libraries/common.lib.php3');
-require('./tbl_properties_common.php3');
-$url_query .= '&amp;goto=tbl_properties.php3';
+require('./libraries/grab_globals.lib.php');
+require('./libraries/common.lib.php');
+require('./tbl_properties_common.php');
+$url_query .= '&amp;goto=tbl_properties.php';
 
 // Note: in tbl_properties_table_info we get and display the table comment.
 // For InnoDB, this comment contains the REFER information but any update
 // has not been done yet (will be done in tbl_relation later).
 $avoid_show_comment = TRUE;
-require('./tbl_properties_table_info.php3');
-require('./libraries/relation.lib.php3');
+require('./tbl_properties_table_info.php');
+require('./libraries/relation.lib.php');
 
 $options_array = array('CASCADE' => 'CASCADE', 'SET_NULL' => 'SET NULL', 'NO_ACTION' => 'NO ACTION', 'RESTRICT' => 'RESTRICT');
 
@@ -223,7 +223,7 @@ if ($cfgRelation['displaywork']
 if ($cfgRelation['commwork']
     && isset($submit_comm) && $submit_comm == 'true') {
     while (list($key, $value) = each($comment)) {
-        // garvin: I exported the snippet here to a function (relation.lib.php3) , so it can be used multiple times throughout other pages where you can set comments.
+        // garvin: I exported the snippet here to a function (relation.lib.php) , so it can be used multiple times throughout other pages where you can set comments.
         PMA_setComment($db, $table, $key, $value);
     }  // end while (transferred data)
 } // end if (commwork)
@@ -342,7 +342,7 @@ if ($col_rs && mysql_num_rows($col_rs) > 0) {
     $saved_row_cnt  = count($save_row);
 
     ?>
-<form method="post" action="tbl_relation.php3">
+<form method="post" action="tbl_relation.php">
     <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
     <input type="hidden" name="submit_rel" value="true" />
 
@@ -482,7 +482,7 @@ if ($col_rs && mysql_num_rows($col_rs) > 0) {
 
         echo "\n";
         ?>
-<form method="post" action="tbl_relation.php3">
+<form method="post" action="tbl_relation.php">
     <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
     <input type="hidden" name="submit_show" value="true" />
 
@@ -518,7 +518,7 @@ if ($col_rs && mysql_num_rows($col_rs) > 0) {
 
         echo "\n";
         ?>
-<form method="post" action="tbl_relation.php3">
+<form method="post" action="tbl_relation.php">
     <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
     <input type="hidden" name="submit_comm" value="true" />
 
@@ -558,5 +558,5 @@ if ($col_rs && mysql_num_rows($col_rs) > 0) {
  * Displays the footer
  */
 echo "\n";
-require('./footer.inc.php3');
+require('./footer.inc.php');
 ?>
diff --git a/tbl_rename.php3 b/tbl_rename.php
old mode 100755
new mode 100644
similarity index 91%
rename from tbl_rename.php3
rename to tbl_rename.php
index 420fd7e77..7bf0ca5d5
--- a/tbl_rename.php3
+++ b/tbl_rename.php
@@ -6,16 +6,16 @@
 /**
  * Gets some core libraries
  */
-require('./libraries/grab_globals.lib.php3');
+require('./libraries/grab_globals.lib.php');
 $js_to_run = 'functions.js';
-require('./libraries/common.lib.php3');
+require('./libraries/common.lib.php');
 
 PMA_checkParameters(array('db','table'));
 
 /**
  * Defines the url to return to in case of error in a sql statement
  */
-$err_url = 'tbl_properties.php3?' . PMA_generate_common_url($db, $table);
+$err_url = 'tbl_properties.php?' . PMA_generate_common_url($db, $table);
 
 
 /**
@@ -33,7 +33,7 @@ if (isset($new_name) && trim($new_name) != '') {
         PMA_checkReservedWords($new_name, $err_url);
     }
 
-    include('./header.inc.php3');
+    include('./header.inc.php');
     PMA_mysql_select_db($db);
     $sql_query = 'ALTER TABLE ' . PMA_backquote($old_name) . ' RENAME ' . PMA_backquote($new_name);
     $result    = PMA_mysql_query($sql_query) or PMA_mysqlDie('', '', '', $err_url);
@@ -41,7 +41,7 @@ if (isset($new_name) && trim($new_name) != '') {
     $reload    = 1;
 
     // garvin: Move old entries from comments to new table
-    include('./libraries/relation.lib.php3');
+    include('./libraries/relation.lib.php');
     $cfgRelation = PMA_getRelationsParam();
     if ($cfgRelation['commwork']) {
         $remove_query = 'UPDATE ' . PMA_backquote($cfgRelation['column_info'])
@@ -97,7 +97,7 @@ if (isset($new_name) && trim($new_name) != '') {
  * No new name for the table!
  */
 else {
-    include('./header.inc.php3');
+    include('./header.inc.php');
     PMA_mysqlDie($strTableEmpty, '', '', $err_url);
 }
 
@@ -105,5 +105,5 @@ else {
 /**
  * Back to the calling script
  */
-require('./tbl_properties_operations.php3');
+require('./tbl_properties_operations.php');
 ?>
diff --git a/tbl_replace.php3 b/tbl_replace.php
old mode 100755
new mode 100644
similarity index 92%
rename from tbl_replace.php3
rename to tbl_replace.php
index 92fecb93d..f72507ac0
--- a/tbl_replace.php3
+++ b/tbl_replace.php
@@ -6,8 +6,8 @@
 /**
  * Gets some core libraries
  */
-require('./libraries/grab_globals.lib.php3');
-require('./libraries/common.lib.php3');
+require('./libraries/grab_globals.lib.php');
+require('./libraries/common.lib.php');
 
 // Check parameters
 PMA_checkParameters(array('db','table','goto'));
@@ -24,7 +24,7 @@ if (!isset($dontlimitchars)) {
 }
 $is_gotofile = FALSE;
 if (isset($after_insert) && $after_insert == 'new_insert') {
-    $goto = 'tbl_change.php3?'
+    $goto = 'tbl_change.php?'
           . PMA_generate_common_url($db, $table, '&')
           . '&goto=' . urlencode($goto)
           . '&pos=' . $pos
@@ -33,8 +33,8 @@ if (isset($after_insert) && $after_insert == 'new_insert') {
           . '&repeat_cells=' . $repeat_cells
           . '&dontlimitchars=' . $dontlimitchars
           . (empty($sql_query) ? '' : '&sql_query=' . urlencode($sql_query));
-} else if ($goto == 'sql.php3') {
-    $goto = 'sql.php3?'
+} else if ($goto == 'sql.php') {
+    $goto = 'sql.php?'
           . PMA_generate_common_url($db, $table, '&')
           . '&pos=' . $pos
           . '&session_max_rows=' . $session_max_rows
@@ -46,7 +46,7 @@ if (isset($after_insert) && $after_insert == 'new_insert') {
     // Security checkings
     $is_gotofile     = ereg_replace('^([^?]+).*$', '\\1', $goto);
     if (!@file_exists('./' . $is_gotofile)) {
-        $goto        = (empty($table)) ? 'db_details.php3' : 'tbl_properties.php3';
+        $goto        = (empty($table)) ? 'db_details.php' : 'tbl_properties.php';
         $is_gotofile = TRUE;
     } else {
         $is_gotofile = ($is_gotofile == $goto);
@@ -84,7 +84,7 @@ if (isset($primary_key) && ($submit_type != $strInsertAsNewRow)) {
         $encoded_key = $key;
         $key         = urldecode($key);
 
-        include('./tbl_replace_fields.php3');
+        include('./tbl_replace_fields.php');
 
         // No change for this column and no MySQL function is used -> next column
         if (empty($funcs[$encoded_key])
@@ -117,7 +117,7 @@ if (isset($primary_key) && ($submit_type != $strInsertAsNewRow)) {
         $message = $strNoModification;
         if ($is_gotofile) {
             $js_to_run = 'functions.js';
-            include('./header.inc.php3');
+            include('./header.inc.php');
             include('./' . ereg_replace('\.\.*', '.', $goto));
         } else {
             header('Location: ' . $cfg['PmaAbsoluteUri'] . $goto . '&disp_message=' . urlencode($message) . '&disp_query=');
@@ -148,7 +148,7 @@ else {
         $key         = urldecode($key);
         $fieldlist   .= PMA_backquote($key) . ', ';
 
-        include('./tbl_replace_fields.php3');
+        include('./tbl_replace_fields.php');
 
         if (empty($funcs[$encoded_key])) {
             $valuelist .= $val . ', ';
@@ -177,7 +177,7 @@ $sql_query = $query . ';';
 $result    = PMA_mysql_query($query);
 if (!$result) {
     $error = PMA_mysql_error();
-    include('./header.inc.php3');
+    include('./header.inc.php');
     PMA_mysqlDie($error, '', '', $err_url);
 } else {
     if (@mysql_affected_rows()) {
@@ -190,12 +190,12 @@ if (!$result) {
         $message .= '<br />'.$strInsertedRowId . '&nbsp;' . $insert_id;
     }
     if ($is_gotofile) {
-        if ($goto == 'db_details.php3' && !empty($table)) {
+        if ($goto == 'db_details.php' && !empty($table)) {
             unset($table);
         }
         $js_to_run = 'functions.js';
         $active_page = $goto;
-        include('./header.inc.php3');
+        include('./header.inc.php');
         include('./' . ereg_replace('\.\.*', '.', $goto));
     } else {
         // I don't understand this one:
diff --git a/tbl_replace_fields.php3 b/tbl_replace_fields.php
old mode 100755
new mode 100644
similarity index 99%
rename from tbl_replace_fields.php3
rename to tbl_replace_fields.php
index 52bd4659e..e95d48c09
--- a/tbl_replace_fields.php3
+++ b/tbl_replace_fields.php
@@ -8,7 +8,7 @@
 // Check parameters
 
 if (!defined('PMA_COMMON_LIB_INCLUDED')) {
-    include('./libraries/common.lib.php3');
+    include('./libraries/common.lib.php');
 }
 
 PMA_checkParameters(array('db','encoded_key'));
diff --git a/tbl_row_delete.php3 b/tbl_row_delete.php
old mode 100755
new mode 100644
similarity index 72%
rename from tbl_row_delete.php3
rename to tbl_row_delete.php
index 6e74c85fd..db714a92a
--- a/tbl_row_delete.php3
+++ b/tbl_row_delete.php
@@ -2,16 +2,16 @@
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
 if (!defined('PMA_GRAB_GLOBALS_INCLUDED')) {
-    include('./libraries/grab_globals.lib.php3');
+    include('./libraries/grab_globals.lib.php');
 }
 if (!defined('PMA_COMMON_LIB_INCLUDED')) {
-    include('./libraries/common.lib.php3');
+    include('./libraries/common.lib.php');
 }
 if (PMA_MYSQL_INT_VERSION >= 40100 && !defined('PMA_MYSQL_CHARSETS_LIB_INCLUDED')) {
-    include('./libraries/mysql_charsets.lib.php3');
+    include('./libraries/mysql_charsets.lib.php');
 }
 
-require('./header.inc.php3');
+require('./header.inc.php');
 
 /**
  * Drop multiple rows if required
@@ -24,17 +24,17 @@ if (isset($submit_mult_x)) {
 
 if ((!empty($submit_mult) && isset($rows_to_delete) && is_array($rows_to_delete))
     || isset($mult_btn)) {
-    $action = 'tbl_row_delete.php3';
-    $err_url = 'tbl_row_delete.php3?' . PMA_generate_common_url($db, $table);
+    $action = 'tbl_row_delete.php';
+    $err_url = 'tbl_row_delete.php?' . PMA_generate_common_url($db, $table);
     if (!isset($mult_btn)) {
         $original_sql_query = $sql_query;
         $original_url_query = $url_query;
         $original_pos       = $pos;
     }
-    include('./mult_submits.inc.php3');
+    include('./mult_submits.inc.php');
 }
 $url_query = PMA_generate_common_url($db, $table)
-           . '&amp;goto=tbl_properties.php3';
+           . '&amp;goto=tbl_properties.php';
 
 
 /**
@@ -57,11 +57,11 @@ if (isset($original_pos)) {
     $pos       = $original_pos;
 }
 
-include('./sql.php3');
+include('./sql.php');
 
 /**
  * Displays the footer
  */
 echo "\n";
-require('./footer.inc.php3');
+require('./footer.inc.php');
 ?>
diff --git a/tbl_select.php3 b/tbl_select.php
old mode 100755
new mode 100644
similarity index 92%
rename from tbl_select.php3
rename to tbl_select.php
index b602308aa..4b5cf6f0e
--- a/tbl_select.php3
+++ b/tbl_select.php
@@ -6,9 +6,9 @@
 /**
  * Gets some core libraries
  */
-require('./libraries/grab_globals.lib.php3');
-require('./libraries/common.lib.php3');
-require('./libraries/relation.lib.php3'); // foreign keys
+require('./libraries/grab_globals.lib.php');
+require('./libraries/common.lib.php');
+require('./libraries/relation.lib.php'); // foreign keys
 
 if ($cfg['PropertiesIconic'] == true) {
     // We need to copy the value or else the == 'both' check will always return true
@@ -30,8 +30,8 @@ if ($cfg['PropertiesIconic'] == true) {
 }
 
 /**
- * Defines arrays of functions (should possibly be in config.inc.php3
- * so it can also be used in tbl_qbe.php3)
+ * Defines arrays of functions (should possibly be in config.inc.php
+ * so it can also be used in tbl_qbe.php)
  *
  * LIKE works also on integers and dates so I added it in numfunctions
  */
@@ -43,10 +43,10 @@ $textfunctions = array('LIKE', '=', '!=');
  */
 if (!isset($param) || $param[0] == '') {
     // Gets some core libraries
-    include('./tbl_properties_common.php3');
-    //$err_url   = 'tbl_select.php3' . $err_url;
-    $url_query .= '&amp;goto=tbl_select.php3&amp;back=tbl_select.php3';
-    include('./tbl_properties_table_info.php3');
+    include('./tbl_properties_common.php');
+    //$err_url   = 'tbl_select.php' . $err_url;
+    $url_query .= '&amp;goto=tbl_select.php&amp;back=tbl_select.php';
+    include('./tbl_properties_table_info.php');
 
     if (!isset($goto)) {
         $goto = $cfg['DefaultTabTable'];
@@ -89,10 +89,10 @@ if (!isset($param) || $param[0] == '') {
         //$foreigners  = ($cfgRelation['relwork'] ? PMA_getForeigners($db, $table) : FALSE);
         $foreigners  = PMA_getForeigners($db, $table);
         ?>
-<form method="post" action="tbl_select.php3" name="insertForm">
+<form method="post" action="tbl_select.php" name="insertForm">
     <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
     <input type="hidden" name="goto" value="<?php echo $goto; ?>" />
-    <input type="hidden" name="back" value="tbl_select.php3" />
+    <input type="hidden" name="back" value="tbl_select.php" />
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
     <?php echo $strSelectFields; ?>&nbsp;:<br />
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -158,7 +158,7 @@ if (!isset($param) || $param[0] == '') {
             // <markus@noga.de>
             $field = $fields_list[$i];
 
-            include('./libraries/get_foreign.lib.php3');
+            include('./libraries/get_foreign.lib.php');
 
             echo "\n";
             // we got a bug report: in some cases, even if $disp is true,
@@ -174,7 +174,7 @@ if (!isset($param) || $param[0] == '') {
             ?>
             <input type="text"   name="fields[]" id="field_<?php echo md5($field); ?>[]" class="textfield" />
             <script type="text/javascript" language="javascript">
-                document.writeln('<a target="_blank" onclick="window.open(this.href, \'foreigners\', \'width=640,height=240,scrollbars=yes\'); return false" href="browse_foreigners.php3?<?php echo PMA_generate_common_url($db, $table); ?>&amp;field=<?php echo urlencode($field); ?>"><?php echo str_replace("'", "\'", $titles['Browse']); ?></a>');
+                document.writeln('<a target="_blank" onclick="window.open(this.href, \'foreigners\', \'width=640,height=240,scrollbars=yes\'); return false" href="browse_foreigners.php?<?php echo PMA_generate_common_url($db, $table); ?>&amp;field=<?php echo urlencode($field); ?>"><?php echo str_replace("'", "\'", $titles['Browse']); ?></a>');
             </script>
             <?php
             } else if (substr($fields_type[$i], 0, 3)=='enu'){
@@ -228,7 +228,7 @@ if (!isset($param) || $param[0] == '') {
         <?php
     } // end if
     echo "\n";
-    include('./footer.inc.php3');
+    include('./footer.inc.php');
 }
 
 
@@ -289,7 +289,7 @@ else {
         $sql_query .= ' ORDER BY ' . PMA_backquote(urldecode($orderField)) . ' ' . $order;
     } // end if
 
-    include('./sql.php3');
+    include('./sql.php');
 }
 
 ?>
diff --git a/transformation_wrapper.php3 b/transformation_wrapper.php
similarity index 88%
rename from transformation_wrapper.php3
rename to transformation_wrapper.php
index 59766fd7d..ca6a0abe6 100644
--- a/transformation_wrapper.php3
+++ b/transformation_wrapper.php
@@ -7,23 +7,23 @@ $is_transformation_wrapper = true;
 /**
  * Get the variables sent or posted to this script and displays the header
  */
-require('./libraries/grab_globals.lib.php3');
+require('./libraries/grab_globals.lib.php');
 
 /**
  * Gets a core script and starts output buffering work
  */
 if (!defined('PMA_COMMON_LIB_INCLUDED')) {
-    include('./libraries/common.lib.php3');
+    include('./libraries/common.lib.php');
 }
 
-require('./libraries/relation.lib.php3'); // foreign keys
-require('./libraries/transformations.lib.php3'); // Transformations
+require('./libraries/relation.lib.php'); // foreign keys
+require('./libraries/transformations.lib.php'); // Transformations
 $cfgRelation = PMA_getRelationsParam();
 
 /**
  * Ensures db and table are valid, else moves to the "parent" script
  */
-require('./libraries/db_table_exists.lib.php3');
+require('./libraries/db_table_exists.lib.php');
 
 
 /**
@@ -61,10 +61,10 @@ if ($cfgRelation['commwork'] && $cfgRelation['mimework']) {
 }
 
 // garvin: For re-usability, moved http-headers and stylesheets
-// to a seperate file. It can now be included by header.inc.php3,
-// queryframe.php3, querywindow.php3.
+// to a seperate file. It can now be included by header.inc.php,
+// queryframe.php, querywindow.php.
 
-include('./libraries/header_http.inc.php3');
+include('./libraries/header_http.inc.php');
 // [MIME]
 $content_type = 'Content-Type: ' . (isset($mime_map[urldecode($transform_key)]['mimetype']) ? str_replace("_", "/", $mime_map[urldecode($transform_key)]['mimetype']) : $default_ct) . (isset($mime_options['charset']) ? $mime_options['charset'] : '');
 header($content_type);
@@ -72,7 +72,7 @@ header($content_type);
 if (!isset($resize)) {
     echo $row[urldecode($transform_key)];
 } else {
-    // if image_*__inline.inc.php3 finds that we can resize,
+    // if image_*__inline.inc.php finds that we can resize,
     // it sets $resize to jpeg or png
    
     $srcImage = imagecreatefromstring($row[urldecode($transform_key)]);
diff --git a/user_password.php3 b/user_password.php
similarity index 88%
rename from user_password.php3
rename to user_password.php
index bd76f4046..765ac8970 100644
--- a/user_password.php3
+++ b/user_password.php
@@ -6,8 +6,8 @@
 /**
  * Gets some core libraries
  */
-require('./libraries/grab_globals.lib.php3');
-require('./libraries/common.lib.php3');
+require('./libraries/grab_globals.lib.php');
+require('./libraries/common.lib.php');
 
 /**
  * Displays an error message and exits if the user isn't allowed to use this
@@ -17,10 +17,10 @@ if (!$cfg['ShowChgPassword']) {
     $cfg['ShowChgPassword'] = @PMA_mysql_query('USE mysql', $userlink);
 }
 if ($cfg['Server']['auth_type'] == 'config' || !$cfg['ShowChgPassword']) {
-    include('./header.inc.php3');
+    include('./header.inc.php');
     echo '<p><b>' . $strError . '</b></p>' . "\n";
     echo '<p>&nbsp;&nbsp;&nbsp;&nbsp;' .  $strNoRights . '</p>' . "\n";
-    include('./footer.inc.php3');
+    include('./footer.inc.php');
     exit();
 } // end if
 
@@ -47,7 +47,7 @@ if (isset($nopass)) {
         // Defines the url to return to in case of error in the sql statement
         $common_url_query = PMA_generate_common_url();
 
-        $err_url          = 'user_password.php3?' . $common_url_query;
+        $err_url          = 'user_password.php?' . $common_url_query;
 
         $sql_query        = 'SET password = ' . (($pma_pw == '') ? '\'\'' : 'PASSWORD(\'' . ereg_replace('.', '*', $pma_pw) . '\')');
         $local_query      = 'SET password = ' . (($pma_pw == '') ? '\'\'' : 'PASSWORD(\'' . PMA_sqlAddslashes($pma_pw) . '\')');
@@ -64,12 +64,12 @@ if (isset($nopass)) {
                      : '';
 
         // Displays the page
-        include('./header.inc.php3');
+        include('./header.inc.php');
         echo '<h1>' . $strChangePassword . '</h1>' . "\n\n";
         $show_query = 'y';
         PMA_showMessage($strUpdateProfileMessage);
         ?>
-        <a href="index.php3?<?php echo $common_url_query . $http_logout; ?>" target="_parent">
+        <a href="index.php?<?php echo $common_url_query . $http_logout; ?>" target="_parent">
             <b><?php echo $strBack; ?></b></a>
         <?php
         exit();
@@ -83,7 +83,7 @@ if (isset($nopass)) {
  */
 // Loads the headers
 $js_to_run = 'user_password.js';
-require('./header.inc.php3');
+require('./header.inc.php');
 echo '<h1>' . $strChangePassword . '</h1>' . "\n\n";
 
 // Displays an error message if required
@@ -99,7 +99,7 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5)
 
 // Displays the form
 ?>
-<form method="post" action="./user_password.php3" name="chgPassword" onsubmit="return checkPassword(this)">
+<form method="post" action="./user_password.php" name="chgPassword" onsubmit="return checkPassword(this)">
     <?php echo PMA_generate_common_hidden_inputs(); ?>
     <table border="0">
     <tr>
@@ -136,5 +136,5 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5)
  * Displays the footer
  */
 echo "\n";
-require('./footer.inc.php3');
+require('./footer.inc.php');
 ?>