diff --git a/ChangeLog b/ChangeLog
index cd7518582..d287822ca 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2001-12-29  Loïc Chapeaux  <lolo@phpheaven.net>
+	* header.inc.php3, lines 60-62; libraries/defines.lib.php3, lines 102-103;
+	  libraries/common.lib.php3, lines 672-678: patch #497632 - Support for
+	  OS/2 browsers thanks to Yuri Dario <ydario at users.sourceforge.net>.
+
 2001-12-28  Loïc Chapeaux  <lolo@phpheaven.net>
 	* lang/spanish.inc.php3: updated thanks to
 	  Gabriel Ginard <gginard at navegalia.com>.
diff --git a/header.inc.php3 b/header.inc.php3
index 830c6a86f..b8f6905fe 100755
--- a/header.inc.php3
+++ b/header.inc.php3
@@ -57,6 +57,9 @@ pre, tt       {font-size: <?php echo $font_size; ?>}
 th            {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; font-weight: bold; background-color: <?php echo $cfgThBgcolor;?>}
 td            {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>}
 form          {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>}
+input         {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
+select        {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
+textarea      {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
 h1            {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_bigger; ?>; font-weight: bold}
 A:link        {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; text-decoration: none; color: #0000ff}
 A:visited     {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; text-decoration: none; color: #0000ff}
diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3
index 3b3e75580..20bb9241d 100644
--- a/libraries/common.lib.php3
+++ b/libraries/common.lib.php3
@@ -669,6 +669,14 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){
             $font_smaller  = 'small';
             $font_smallest = 'x-small';
         }
+        // OS/2 browser
+        else if (PMA_USR_OS == 'OS/2'
+                 && PMA_USR_BROWSER_AGENT == 'OPERA') {
+            $font_size     = 'small';
+            $font_bigger   = 'medium';
+            $font_smaller  = 'x-small';
+            $font_smallest = 'x-small';
+        }
         else {
             $font_size     = 'small';
             $font_bigger   = 'large';
diff --git a/libraries/defines.lib.php3 b/libraries/defines.lib.php3
index f80df4ec5..7aa04beea 100644
--- a/libraries/defines.lib.php3
+++ b/libraries/defines.lib.php3
@@ -99,6 +99,8 @@ if (!defined('PMA_USR_OS')) {
         define('PMA_USR_OS', 'Linux');
     } else if (strstr($HTTP_USER_AGENT, 'Unix')) {
         define('PMA_USR_OS', 'Unix');
+    } else if (strstr($HTTP_USER_AGENT, 'OS/2')) {
+        define('PMA_USR_OS', 'OS/2');
     } else {
         define('PMA_USR_OS', 'Other');
     }