diff --git a/ChangeLog b/ChangeLog
index 8559e84c9..45f72b1f2 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@ $Source$
 2004-10-20 Michal Čihař  <michal@cihar.com>
     * lang/czech: Update.
     * tbl_relation.php: Backquote table name (bug #1050441).
+    * db_details_qbe.php: Backquote table name.
 
 2004-10-19 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/database_interface.lib.php: bug #1041667, correctly
diff --git a/db_details_qbe.php b/db_details_qbe.php
index 870aa67fe..1487afcce 100644
--- a/db_details_qbe.php
+++ b/db_details_qbe.php
@@ -952,12 +952,12 @@ if (isset($Field) && count($Field) > 0) {
             if ($run > 5) {
 
                 foreach ($tab_left AS $tab) {
-                    $emerg    .= ', ' . $tab;
+                    $emerg    .= ', ' . PMA_backquote($tab);
                     $tab_left = PMA_arrayShort($tab_left, $tab);
                 }
             }
         } // end while
-        $qry_from = $master . $emerg . $fromclause;
+        $qry_from = PMA_backquote($master) . $emerg . $fromclause;
     } // end if ($cfgRelation['relwork'] && count($tab_all) > 0)
 
 } // end count($Field) > 0