diff --git a/ChangeLog b/ChangeLog
index 7e6db61ed..6af91408e 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@ $Source$
 
 2003-06-08 Alexander M. Turek  <rabus@users.sourceforge.net>
     * server_privileges.php3: MySQL 4.1 users could not edit column privileges.
+    * tbl_properties.inc.php3, tbl_properties_structure.inc.php3:
+      SET and ENUM fields may have a character set, too.
 
 2003-06-07 Alexander M. Turek  <rabus@users.sourceforge.net>
     * libraries/common.lib.php3: Incremented required config.inc.php3 revision
diff --git a/tbl_properties.inc.php3 b/tbl_properties.inc.php3
index 92f47ab9a..fc6e2a412 100755
--- a/tbl_properties.inc.php3
+++ b/tbl_properties.inc.php3
@@ -274,6 +274,8 @@ for ($i = 0 ; $i < $num_fields; $i++) {
             || strtolower(substr($type, 0, 8)) == 'tinytext'
             || strtolower(substr($type, 0, 10)) == 'mediumtext'
             || strtolower(substr($type, 0, 8)) == 'longtext'
+            || strtolower(substr($type, 0, 3)) == 'set'
+            || strtolower(substr($type, 0, 4)) == 'enum'
             ) && !$binary) {
             $real_charset = strpos($row['Collation'], '_') ? substr($row['Collation'], 0, strpos($row['Collation'], '_')) : $row['Collation'];
         } else {
diff --git a/tbl_properties_structure.php3 b/tbl_properties_structure.php3
index c66d29501..c3410e5c7 100755
--- a/tbl_properties_structure.php3
+++ b/tbl_properties_structure.php3
@@ -148,6 +148,8 @@ while ($row = PMA_mysql_fetch_array($fields_rs)) {
             || substr($type, 0, 8) == 'tinytext'
             || substr($type, 0, 10) == 'mediumtext'
             || substr($type, 0, 8) == 'longtext'
+            || strtolower(substr($type, 0, 3)) == 'set'
+            || strtolower(substr($type, 0, 4)) == 'enum'
             ) && !$binary) {
             if (strpos($type, ' character set ')) {
                 $type = substr($type, 0, strpos($type, ' character set '));
@@ -700,4 +702,4 @@ require('./tbl_query_box.php3');
  */
 echo "\n";
 require('./footer.inc.php3');
-?>
+?>
\ No newline at end of file