diff --git a/ChangeLog b/ChangeLog
index ebaa4f4cf..7960bf26a 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@ $Source$
 2005-02-02 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/dbi/*: PMA_DBI_num_rows(): do not send a boolean
       to mysqli_num_rows() or mysql_num_row(), it expects a result resource 
+    * tbl_properties.inc.php: bug #1114550, changing the type of 
+      a float unsigned column
 
 2005-01-30 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/export/sql.php: bug #1108521, part 2: mysqli_num_rows
diff --git a/tbl_properties.inc.php b/tbl_properties.inc.php
index eebe47386..cfd138a16 100644
--- a/tbl_properties.inc.php
+++ b/tbl_properties.inc.php
@@ -257,6 +257,9 @@ for ($i = 0 ; $i < $num_fields; $i++) {
         $length = $submit_length;
     }
 
+    // rtrim the type, for cases like "float unsigned"
+    $type = rtrim($type);
+
     $cnt_column_types = count($cfg['ColumnTypes']);
     for ($j = 0; $j < $cnt_column_types; $j++) {
         $content_cells[$i][$ci] .= '                <option value="'. $cfg['ColumnTypes'][$j] . '"';