diff --git a/ChangeLog b/ChangeLog
index 227fa84a9..c0de70af2 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@ $Source$
       information_schema
     * browse_foreigners.php: bug #1242805, Show All does not work while
       browsing foreign values
+    * libraries/relation.lib.php: for the new ForeignKeyDropdownOrder, id and
+      content were reversed (id-content showed content then id)
 
 2005-07-21 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/auth/cookie.auth.lib.php: bug #1240880, XSS on the
diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php
index e5bff32bb..467ddd160 100644
--- a/libraries/relation.lib.php
+++ b/libraries/relation.lib.php
@@ -825,8 +825,8 @@ function PMA_foreignDropdown($disp, $foreign_field, $foreign_display, $data, $ma
            $reloption .= ' selected="selected"';
         } // end if
 
-        $reloptions['id-content'][] = $reloption . '>' . $value . '&nbsp;-&nbsp;' . htmlspecialchars($key) .  '</option>' . "\n";
-        $reloptions['content-id'][] = $reloption . '>' . htmlspecialchars($key) .  '&nbsp;-&nbsp;' . $value . '</option>' . "\n";
+        $reloptions['content-id'][] = $reloption . '>' . $value . '&nbsp;-&nbsp;' . htmlspecialchars($key) .  '</option>' . "\n";
+        $reloptions['id-content'][] = $reloption . '>' . htmlspecialchars($key) .  '&nbsp;-&nbsp;' . $value . '</option>' . "\n";
     } // end while
 
     // the list of keys looks better if not sorted by description