diff --git a/browse_foreigners.php b/browse_foreigners.php
index 823fc1066..bb58864ca 100644
--- a/browse_foreigners.php
+++ b/browse_foreigners.php
@@ -91,8 +91,8 @@ if (isset($disp_row) && is_array($disp_row)) {
     <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" />
     <link rel="stylesheet" type="text/css"
         href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&amp;js_frame=right&amp;nocache=<?php echo $_SESSION['PMA_Config']->getMtime(); ?>" />
-    <script src="./js/functions.js" type="text/javascript" language="javascript"></script>
-    <script type="text/javascript" language="javascript">
+    <script src="./js/functions.js" type="text/javascript"></script>
+    <script type="text/javascript">
     //<![CDATA[
     self.focus();
     function formupdate(field, key) {
diff --git a/calendar.php b/calendar.php
index 64262f7c5..93db748ce 100644
--- a/calendar.php
+++ b/calendar.php
@@ -13,8 +13,8 @@ require_once './libraries/header_http.inc.php';
 $page_title = $strCalendar;
 require './libraries/header_meta_style.inc.php';
 ?>
-<script type="text/javascript" language="javascript" src="./js/tbl_change.js"></script>
-<script type="text/javascript" language="javascript">
+<script type="text/javascript" src="./js/tbl_change.js"></script>
+<script type="text/javascript">
 //<![CDATA[
 var month_names = new Array("<?php echo implode('","', $month); ?>");
 var day_names = new Array("<?php echo implode('","', $day_of_week); ?>");
diff --git a/db_datadict.php b/db_datadict.php
index efa4d72c0..742f12141 100644
--- a/db_datadict.php
+++ b/db_datadict.php
@@ -306,7 +306,7 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) {
  * Displays the footer
  */
 ?>
-<script type="text/javascript" language="javascript">
+<script type="text/javascript">
 //<![CDATA[
 function printPage()
 {
diff --git a/db_printview.php b/db_printview.php
index d164a46b1..77b06e636 100644
--- a/db_printview.php
+++ b/db_printview.php
@@ -248,7 +248,7 @@ else {
  */
 ?>
 
-<script type="text/javascript" language="javascript">
+<script type="text/javascript">
 //<![CDATA[
 function printPage()
 {
diff --git a/db_structure.php b/db_structure.php
index 0413e54c5..568144dbf 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -488,7 +488,7 @@ echo '    <option value="' . $strAnalyzeTable . '" >'
      . $strAnalyzeTable . '</option>' . "\n";
 ?>
 </select>
-<script type="text/javascript" language="javascript">
+<script type="text/javascript">
 <!--
 // Fake js to allow the use of the <noscript> tag
 //-->
diff --git a/export.php b/export.php
index ea22cdaca..394ee4660 100644
--- a/export.php
+++ b/export.php
@@ -645,7 +645,7 @@ else {
     echo '</div>' . "\n";
     echo "\n";
 ?>
-<script type="text/javascript" language="javascript">
+<script type="text/javascript">
 //<![CDATA[
     var bodyWidth=null; var bodyHeight=null;
     if (document.getElementById('textSQLDUMP')) {
diff --git a/index.php b/index.php
index 9e5a60f4e..dc4c3637f 100644
--- a/index.php
+++ b/index.php
@@ -111,7 +111,7 @@ header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
     <?php echo htmlspecialchars($HTTP_HOST); ?></title>
 <meta http-equiv="Content-Type"
     content="text/html; charset=<?php echo $GLOBALS['charset']; ?>" />
-<script type="text/javascript" language="javascript">
+<script type="text/javascript"">
 // <![CDATA[
     // definitions used in querywindow.js
     var common_query = '<?php echo PMA_escapeJsString(PMA_generate_common_url('', '', '&'));?>';
@@ -128,8 +128,7 @@ header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
     var pma_absolute_uri = '<?php echo PMA_escapeJsString($GLOBALS['cfg']['PmaAbsoluteUri']); ?>';
 // ]]>
 </script>
-<script src="./js/querywindow.js" type="text/javascript" language="javascript">
-</script>
+<script src="./js/querywindow.js" type="text/javascript"></script>
 </head>
 <frameset cols="<?php
 if ($GLOBALS['text_dir'] === 'rtl') {
@@ -159,7 +158,7 @@ if ($GLOBALS['text_dir'] === 'ltr') {
         </body>
     </noframes>
 </frameset>
-<script type="text/javascript" language="javascript">
+<script type="text/javascript">
 // <![CDATA[
 <?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
     var frame_content = window.frames[1];
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index dfc160062..3695ec284 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -670,13 +670,13 @@ function PMA_sendHeaderLocation($uri)
         echo '<meta http-equiv="Pragma" content="no-cache">' . "\n";
         echo '<meta http-equiv="Cache-Control" content="no-cache">' . "\n";
         echo '<meta http-equiv="Refresh" content="0;url=' .$uri . '">' . "\n";
-        echo '<script type="text/javascript" language="javascript">' . "\n";
+        echo '<script type="text/javascript">' . "\n";
         echo '//<![CDATA[' . "\n";
         echo 'setTimeout ("window.location = unescape(\'"' . $uri . '"\')",2000); </script>' . "\n";
         echo '//]]>' . "\n";
         echo '</head>' . "\n";
         echo '<body>' . "\n";
-        echo '<script type="text/javascript" language="javascript">' . "\n";
+        echo '<script type="text/javascript">' . "\n";
         echo '//<![CDATA[' . "\n";
         echo 'document.write (\'<p><a href="' . $uri . '">' . $GLOBALS['strGo'] . '</a></p>\');' . "\n";
         echo '//]]>' . "\n";
@@ -922,7 +922,7 @@ function PMA_reloadNavigation()
         echo "\n";
         $reload_url = './navigation.php?' . PMA_generate_common_url($GLOBALS['db'], '', '&');
         ?>
-<script type="text/javascript" language="javascript">
+<script type="text/javascript">
 //<![CDATA[
 if (typeof(window.parent) != 'undefined'
     && typeof(window.parent.frame_navigation) != 'undefined') {
@@ -974,7 +974,7 @@ function PMA_showMessage($message, $sql_query = null)
             PMA_DBI_free_result($result);
             $uni_tbl = PMA_jsFormat($GLOBALS['db'] . '.' . $GLOBALS['table'], false);
             echo "\n";
-            echo '<script type="text/javascript" language="javascript">' . "\n";
+            echo '<script type="text/javascript">' . "\n";
             echo '//<![CDATA[' . "\n";
             echo "window.parent.updateTableTitle('" . $uni_tbl . "', '" . PMA_jsFormat($tooltip, false) . "');" . "\n";
             echo '//]]>' . "\n";
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index 88b3292ea..60fe0dd4c 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -96,7 +96,7 @@ echo PMA_pluginGetJavascript($export_list);
 </div>
 </td></tr></table>
 
-<script type="text/javascript" language="javascript">
+<script type="text/javascript">
 //<![CDATA[
     init_options();
 //]]>
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index b3ce9c3a5..e40aa84fa 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -182,7 +182,7 @@ echo "\n";
         <input type="submit" value="<?php echo $strGo; ?>" id="buttonGo" />
     </fieldset>
 </form>
-<script type="text/javascript" language="javascript">
+<script type="text/javascript">
 //<![CDATA[
     init_options();
 //]]>
diff --git a/libraries/header.inc.php b/libraries/header.inc.php
index 030ec13ed..d4f534d1d 100644
--- a/libraries/header.inc.php
+++ b/libraries/header.inc.php
@@ -54,7 +54,7 @@ if (empty($GLOBALS['is_header_sent'])) {
     // here, the function does not exist with this configuration: $cfg['ServerDefault'] = 0;
     $is_superuser    = function_exists('PMA_isSuperuser') && PMA_isSuperuser();
     ?>
-    <script type="text/javascript" language="javascript">
+    <script type="text/javascript">
     // <![CDATA[
     // Updates the title of the frameset if possible (ns4 does not allow this)
     if (typeof(parent.document) != 'undefined' && typeof(parent.document) != 'unknown'
@@ -75,7 +75,7 @@ if (empty($GLOBALS['is_header_sent'])) {
     var confirmMsgDropDB  = '<?php echo(($GLOBALS['cfg']['Confirm']) ? str_replace('\'', '\\\'', $GLOBALS['strDropDatabaseStrongWarning']) : ''); ?>';
     // ]]>
     </script>
-    <script src="./js/functions.js" type="text/javascript" language="javascript"></script>
+    <script src="./js/functions.js" type="text/javascript"></script>
         <?php
     } elseif (isset($js_to_run) && $js_to_run == 'user_password.js') {
         echo "\n";
@@ -87,7 +87,7 @@ if (empty($GLOBALS['is_header_sent'])) {
     var jsPasswordNotSame = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strPasswordNotSame']); ?>';
     // ]]>
     </script>
-    <script src="./js/user_password.js" type="text/javascript" language="javascript"></script>
+    <script src="./js/user_password.js" type="text/javascript"></script>
         <?php
     } elseif (isset($js_to_run) && $js_to_run == 'server_privileges.js') {
         echo "\n";
@@ -99,8 +99,8 @@ if (empty($GLOBALS['is_header_sent'])) {
     var jsPasswordNotSame = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strPasswordNotSame']); ?>';
     // ]]>
     </script>
-    <script src="./js/server_privileges.js" type="text/javascript" language="javascript"></script>
-    <script src="./js/functions.js" type="text/javascript" language="javascript"></script>
+    <script src="./js/server_privileges.js" type="text/javascript"></script>
+    <script src="./js/functions.js" type="text/javascript"></script>
         <?php
     } elseif (isset($js_to_run) && $js_to_run == 'indexes.js') {
         echo "\n";
@@ -110,14 +110,14 @@ if (empty($GLOBALS['is_header_sent'])) {
     var errorMsg1   = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strNotNumber']); ?>';
     // ]]>
     </script>
-    <script src="./js/indexes.js" type="text/javascript" language="javascript"></script>
+    <script src="./js/indexes.js" type="text/javascript"></script>
         <?php
     } elseif (isset($js_to_run) && $js_to_run == 'tbl_change.js') {
         echo "\n";
         ?>
     // ]]>
     </script>
-    <script src="./js/tbl_change.js" type="text/javascript" language="javascript"></script>
+    <script src="./js/tbl_change.js" type="text/javascript"></script>
         <?php
     } else {
         echo "\n";
@@ -131,8 +131,7 @@ if (empty($GLOBALS['is_header_sent'])) {
     // Reloads the navigation frame via JavaScript if required
     PMA_reloadNavigation();
     ?>
-    <script src="./js/tooltip.js" type="text/javascript"
-        language="javascript"></script>
+    <script src="./js/tooltip.js" type="text/javascript"></script>
     <meta name="OBGZip" content="<?php echo ($cfg['OBGzip'] ? 'true' : 'false'); ?>" />
     <?php /* remove vertical scroll bar bug in ie */ ?>
     <!--[if IE 6]>
diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php
index 6b53ee0a7..31f3aab33 100644
--- a/libraries/plugin_interface.lib.php
+++ b/libraries/plugin_interface.lib.php
@@ -318,7 +318,7 @@ function PMA_pluginGetOptions($section, &$list)
  */
 function PMA_pluginGetJavascript(&$list) {
     $ret = '
-    <script type="text/javascript" language="javascript">
+    <script type="text/javascript">
     //<![CDATA[
     function hide_them_all() {
         ';
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index 6f500253c..3c7e53331 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -166,7 +166,7 @@ function PMA_sqlQueryForm($query = true, $display_tab = false, $delimiter = ';')
     echo '</form>' . "\n";
     if ($is_querywindow) {
         ?>
-        <script type="text/javascript" language="javascript">
+        <script type="text/javascript">
         //<![CDATA[
             if (window.opener) {
                 window.opener.parent.insertQuery();
@@ -364,7 +364,7 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
     echo '<div class="formelement">' . "\n";
     if ($is_querywindow) {
         ?>
-        <script type="text/javascript" language="javascript">
+        <script type="text/javascript">
         //<![CDATA[
             document.writeln(' <input type="checkbox" name="LockFromUpdate" value="1" id="checkbox_lock" /> <label for="checkbox_lock"><?php echo $GLOBALS['strQueryWindowLock']; ?></label> ');
         //]]>
diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php
index eeea295f7..d5edf9b24 100644
--- a/libraries/tbl_properties.inc.php
+++ b/libraries/tbl_properties.inc.php
@@ -28,12 +28,12 @@ if (is_int($cfg['DefaultPropDisplay'])) {
 
 if ($cfg['CtrlArrowsMoving']) {
     ?>
-<script src="./js/keyhandler.js" type="text/javascript" language="javascript"></script>
-<script type="text/javascript" language="javascript">
-<!--
+<script src="./js/keyhandler.js" type="text/javascript"></script>
+<script type="text/javascript">
+// <![CDATA[
 var switch_movement = <?php echo $display_type == 'horizontal' ? '0' : '1'; ?>;
 document.onkeydown = onKeyDownArrowsHandler;
-// -->
+// ]]>
 </script>
     <?php
 }
@@ -43,8 +43,8 @@ document.onkeydown = onKeyDownArrowsHandler;
 
 if (PMA_MYSQL_INT_VERSION >= 40102) {
     ?>
-<script type="text/javascript" language="javascript">
-<!--
+<script type="text/javascript">
+// <![CDATA[
 function display_field_options(field_type, i) {
     if (field_type == 'TIMESTAMP') {
         getElement('div_' + i + '_7').style.display = 'block';
@@ -54,7 +54,7 @@ function display_field_options(field_type, i) {
     }
     return true;
 }
-// -->
+// ]]>
 </script>
 <?php } ?>
 
@@ -623,8 +623,8 @@ if ($display_type == 'horizontal') {
         $new_field .= '<td align="center">' . $content_row_val . '</td>';
     }
     ?>
-<script type="text/javascript" language="javascript">
-<!--
+<script type="text/javascript">
+// <![CDATA[
 var odd_row = <?php echo $odd_row; ?>;
 
 function addField() {
@@ -643,7 +643,7 @@ function addField() {
 
     return true;
 }
-// -->
+// ]]>
 </script>
     <?php
 }
diff --git a/pdf_pages.php b/pdf_pages.php
index 4deef20d0..02673821a 100644
--- a/pdf_pages.php
+++ b/pdf_pages.php
@@ -335,7 +335,7 @@ if ($cfg['WYSIWYG-PDF']) {
         $with_field_names = TRUE;
     }
 ?>
-<script type="text/javascript" language="javascript" src="./js/dom-drag.js"></script>
+<script type="text/javascript" src="./js/dom-drag.js"></script>
 <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();" />
@@ -376,7 +376,7 @@ foreach ($array_sh_page AS $key => $temp_sh_page) {
 }
 ?>
 </div>
-<script type="text/javascript" language="javascript">
+<script type="text/javascript">
 //<![CDATA[
 function init() {
     refreshLayout();
@@ -552,7 +552,7 @@ function resetDrag() {
 <?php
         if ((isset($showwysiwyg) && $showwysiwyg == '1')) {
 ?>
-<script type="text/javascript" language="javascript">
+<script type="text/javascript">
 //<![CDATA[
 ToggleDragDrop('pdflayout');
 //]]>
diff --git a/scripts/setup.php b/scripts/setup.php
index 9b8590ed6..e4e7c4b6f 100644
--- a/scripts/setup.php
+++ b/scripts/setup.php
@@ -94,7 +94,7 @@ echo '<?xml version="1.0" encoding="utf-8"?>' . "\n";
     <title>phpMyAdmin <?php echo $PMA_Config_Setup->get('PMA_VERSION'); ?> setup</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
-    <script type="text/javascript" language="javascript">
+    <script type="text/javascript">
     //<![CDATA[
     // show this window in top frame
     if (top != self) {
@@ -1289,7 +1289,7 @@ switch ($action) {
         echo htmlspecialchars(get_cfg_string($configuration));
         echo '</textarea></form>' . "\n";
         ?>
-<script type="text/javascript" language="javascript">
+<script type="text/javascript">
 //<![CDATA[
     var bodyWidth=null; var bodyHeight=null;
     if (document.getElementById('textconfig')) {
diff --git a/sql.php b/sql.php
index e9346535a..9eef6dc15 100644
--- a/sql.php
+++ b/sql.php
@@ -779,7 +779,7 @@ else {
     // Do print the page if required
     if (isset($printview) && $printview == '1') {
         ?>
-<script type="text/javascript" language="javascript">
+<script type="text/javascript">
 //<![CDATA[
 // Do print the page
 window.onload = function()
diff --git a/tbl_change.php b/tbl_change.php
index c6b641ff2..b940a1dbf 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -190,8 +190,8 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5)
 
 <?php if ($cfg['CtrlArrowsMoving']) { ?>
 <!-- Set on key handler for moving using by Ctrl+arrows -->
-<script src="./js/keyhandler.js" type="text/javascript" language="javascript"></script>
-<script type="text/javascript" language="javascript">
+<script src="./js/keyhandler.js" type="text/javascript"></script>
+<script type="text/javascript">
 //<![CDATA[
 var switch_movement = 0;
 document.onkeydown = onKeyDownArrowsHandler;
@@ -648,7 +648,7 @@ foreach ($loop_array as $vrowcount => $vrow) {
                 tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>"
                 id="field_<?php echo ($idindex); ?>_3"
                 value="<?php echo htmlspecialchars($data); ?>" />
-            <script type="text/javascript" language="javascript">
+            <script type="text/javascript">
             //<![CDATA[
                 document.writeln('<a target="_blank" onclick="window.open(this.href, \'foreigners\', \'width=640,height=240,scrollbars=yes,resizable=yes\'); return false"');
                 document.writeln(' href="browse_foreigners.php?');
@@ -955,7 +955,7 @@ foreach ($loop_array as $vrowcount => $vrow) {
                 }
                 if ($type == 'date' || $type == 'datetime' || substr($type, 0, 9) == 'timestamp') {
                     ?>
-                    <script type="text/javascript" language="javascript">
+                    <script type="text/javascript">
                     //<![CDATA[
                     document.write('<a title="<?php echo $strCalendar;?>"');
                     document.write(' href="javascript:openCalendar(\'<?php echo PMA_generate_common_url();?>\', \'insertForm\', \'field_<?php echo ($idindex); ?>_3\', \'<?php echo (PMA_MYSQL_INT_VERSION >= 40100 && substr($type, 0, 9) == 'timestamp') ? 'datetime' : substr($type, 0, 9); ?>\')">');
diff --git a/tbl_printview.php b/tbl_printview.php
index 3d1540ede..0ffeb31c7 100644
--- a/tbl_printview.php
+++ b/tbl_printview.php
@@ -539,7 +539,7 @@ foreach ($the_tables as $key => $table) {
  */
 ?>
 
-<script type="text/javascript" language="javascript">
+<script type="text/javascript">
 //<![CDATA[
 function printPage()
 {
diff --git a/tbl_select.php b/tbl_select.php
index 60252b0b8..183e481d6 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -94,7 +94,7 @@ if (!isset($param) || $param[0] == '') {
     //$foreigners  = ($cfgRelation['relwork'] ? PMA_getForeigners($db, $table) : FALSE);
     $foreigners  = PMA_getForeigners($db, $table);
     ?>
-<script type="text/javascript" language="javascript">
+<script type="text/javascript">
 // <![CDATA[
 function PMA_tbl_select_operator(f, index, multiple) {
     switch (f.elements["func[" + index + "]"].options[f.elements["func[" + index + "]"].selectedIndex].value) {
@@ -195,7 +195,7 @@ while (list($operator) = each($GLOBALS['cfg']['UnaryOperators'])) {
     <?php
     $odd_row = true;
 ?>
-<script type="text/javascript" language="javascript" src="./js/tbl_change.js"></script>
+<script type="text/javascript" src="./js/tbl_change.js"></script>
 <?php
     for ($i = 0; $i < $fields_cnt; $i++) {
         ?>
@@ -263,8 +263,10 @@ while (list($operator) = each($GLOBALS['cfg']['UnaryOperators'])) {
             <input type="text" name="fields[<?php echo $i; ?>]"
                 id="field_<?php echo md5($field); ?>[<?php echo $i; ?>]"
                 class="textfield" />
-            <script type="text/javascript" language="javascript">
+            <script type="text/javascript">
+            // <![CDATA[
                 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); ?>&amp;fieldkey=<?php echo $i; ?>"><?php echo str_replace("'", "\'", $titles['Browse']); ?></a>');
+            // ]]>
             </script>
             <?php
         } elseif (strncasecmp($fields_type[$i], 'enum', 4) == 0) {
@@ -286,7 +288,7 @@ while (list($operator) = each($GLOBALS['cfg']['UnaryOperators'])) {
         $type = $fields_type[$i];
         if ($type == 'date' || $type == 'datetime' || substr($type, 0, 9) == 'timestamp') {
         ?>
-                    <script type="text/javascript" language="javascript">
+                    <script type="text/javascript">
                     //<![CDATA[
                     document.write('<a title="<?php echo $strCalendar;?>" href="javascript:openCalendar(\'<?php echo PMA_generate_common_url();?>\', \'insertForm\', \'field_<?php echo ($i); ?>\', \'<?php echo (PMA_MYSQL_INT_VERSION >= 40100 && substr($type, 0, 9) == 'timestamp') ? 'datetime' : substr($type, 0, 9); ?>\')"><img class="calendar" src="<?php echo $pmaThemeImage; ?>b_calendar.png" alt="<?php echo $strCalendar; ?>"/></a>');
                     //]]>
diff --git a/test/theme.php b/test/theme.php
index 3814fff95..2a1ea53fc 100644
--- a/test/theme.php
+++ b/test/theme.php
@@ -35,8 +35,7 @@ header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
         href="../phpmyadmin.css.php?<?php echo PMA_generate_common_url(); ?>&amp;js_frame=right&amp;nocache=<?php echo $_SESSION['PMA_Config']->getMtime(); ?>" />
     <link rel="stylesheet" type="text/css" media="print"
         href="../print.css" />
-    <script src="../js/functions.js" type="text/javascript"
-        language="javascript"></script>
+    <script src="../js/functions.js" type="text/javascript"></script>
 </head>
 <body>
 <?php