diff --git a/ChangeLog b/ChangeLog
index bc46f3751..8d26764a1 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,8 @@ $Source$
     * css/phpmyadmin.css.php, libraries/auth/cookie.auth.lib.php: Use
       fieldsets on login form (RFE #1364546), use notice box for cookie
       information.
+    * libraries/display_select_lang.lib.php,
+      libraries/auth/cookie.auth.lib.php: Use fieldset for language selection.
 
 2005-11-22 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * added test/theme.php: for testing themes
diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
index e779f0461..b3362aceb 100644
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -144,7 +144,7 @@ echo sprintf( $GLOBALS['strWelcome'],
     if (empty($cfg['Lang'])) {
         echo "\n";
         require_once('./libraries/display_select_lang.lib.php');
-        PMA_select_language();
+        PMA_select_language(TRUE);
     }
     echo "\n\n";
 
diff --git a/libraries/display_select_lang.lib.php b/libraries/display_select_lang.lib.php
index cab8f60a1..68f22c396 100644
--- a/libraries/display_select_lang.lib.php
+++ b/libraries/display_select_lang.lib.php
@@ -12,7 +12,7 @@
  * @return  the sorted array
  * @access  private
  */
-function PMA_language_cmp( &$a, $b ) {
+function PMA_language_cmp( &$a, &$b ) {
     return (strcmp($a[1], $b[1]));
 } // end of the 'PMA_language_cmp()' function
 
@@ -21,7 +21,7 @@ function PMA_language_cmp( &$a, $b ) {
  *
  * @access  public
  */
-function PMA_select_language() {
+function PMA_select_language($use_fieldset = FALSE) {
     global $cfg, $lang;
 ?>
 <form method="post" action="index.php" target="_parent">
@@ -42,12 +42,25 @@ function PMA_select_language() {
     if (isset($GLOBALS['server'])) {
         echo '            <input type="hidden" name="server" value="' . ((int)$GLOBALS['server']) . '" />' . "\n";
     }
+    if ($use_fieldset) {
+        echo '<fieldset>';
+        echo '<legend>';
+    }
     ?>
             Language <a href="./translators.html" target="documentation"><?php
             if ( $cfg['ReplaceHelpImg'] ) {
                 echo '<img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_info.png" width="11" height="11" alt="Info" />';
             } else { echo '(*)'; }
-?></a>: <select name="lang" onchange="this.form.submit();">
+?></a>
+    <?php
+    if ($use_fieldset) {
+        echo '</legend>';
+    } else {
+        echo ':';
+    }
+    ?>
+    <select name="lang" onchange="this.form.submit();">
+
     <?php
 
     uasort($GLOBALS['available_languages'], 'PMA_language_cmp');
@@ -77,8 +90,25 @@ function PMA_select_language() {
     }
     ?>
                 </select>
+    <?php
+    if ($use_fieldset) {
+        echo '</fieldset>';
+    }
+    ?>
+                <noscript>
+    <?php
+    if ($use_fieldset) {
+        echo '<fieldset class="tblFooters">';
+    }
+    ?>
+                <input type="submit" value="Go" />
+    <?php
+    if ($use_fieldset) {
+        echo '</fieldset>';
+    }
+    ?>
+                </noscript>
             </bdo>
-                <noscript><input type="submit" value="Go" /></noscript>
             </form>
 <?php
 } // End of function PMA_select_language