diff --git a/ChangeLog b/ChangeLog
index f039ce0b6..381039789 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,10 +15,10 @@ $Source$
       bug #990724).
     * libraries/export/sql.php: Fix export of '0' strings (bug #990398).
 
-
 2004-07-15 Marc Delisle  <lem9@users.sourceforge.net>
     * tbl_change.php: bug 990959, undefined index for DATETIME
       field (problem in UTF-8 only!)
+    * main.php: bug 984136: other fix for RTL and logo
 
 2004-07-14 Marc Delisle  <lem9@users.sourceforge.net>
     * index.php, libraries/common.lib.php: bug 989581 and left panel
diff --git a/main.php b/main.php
index 90fb81a76..bc730bef0 100644
--- a/main.php
+++ b/main.php
@@ -134,8 +134,14 @@ if (($server > 0) && isset($mode) && ($mode == 'reload')) {
         </td>
         <?php
         if (@file_exists($pmaThemeImage . 'logo_right.png')) {
-            echo '        <td align="right" valign="top">' . "\n";
-            echo '            <img src="' . $pmaThemeImage . 'logo_right.png" alt="phpMyAdmin - Logo" border="0" hspace="5" vspace="5" align="right" />' . "\n";
+            // td and img seems not to obey the general dir= of the html tag
+            if ($GLOBALS['text_dir'] == 'ltr') {
+               $tmp_align = 'right';
+            } else {
+               $tmp_align = 'left';
+            }
+            echo '        <td align="' . $tmp_align . '" valign="top">' . "\n";
+            echo '            <img src="' . $pmaThemeImage . 'logo_right.png" alt="phpMyAdmin - Logo" border="0" hspace="5" vspace="5" align="' . $tmp_align . '" />' . "\n";
             echo '        </td>';
         }
         ?>