diff --git a/ChangeLog b/ChangeLog
index b9861d8f5..f80a41f03 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@ $Source$
     * main.php, server_privileges.php, libraries/common.lib.php:
       replace charset introducers by CONVERT USING, 
       to support servers where the mysql.* tables are not in latin1
+    * libraries/database_interface.lib.php: do not add BINARY and VARBINARY
+      twice in the drop-down list of field types
 
 2004-09-02 Alexander M. Turek  <me@derrabus.de>
     * Documentation.html: Typos; added a note about the deprecated MySQL
diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index 4073c6089..835649142 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -157,8 +157,12 @@ function PMA_DBI_postConnect($link) {
         $collation_connection = PMA_DBI_get_variable('collation_connection', PMA_DBI_GETVAR_SESSION, $link);
 
         // Add some field types to the list
-        $GLOBALS['cfg']['ColumnTypes'][] = 'BINARY';
-        $GLOBALS['cfg']['ColumnTypes'][] = 'VARBINARY';
+        // (we pass twice here; feel free to code something better :)
+        if (!defined('PMA_ADDED_FIELD_TYPES')) {
+            $GLOBALS['cfg']['ColumnTypes'][] = 'BINARY';
+            $GLOBALS['cfg']['ColumnTypes'][] = 'VARBINARY';
+            define('PMA_ADDED_FIELD_TYPES',1);
+        }
 
     } else {
         require_once('./libraries/charset_conversion.lib.php');