diff --git a/ChangeLog b/ChangeLog
index 8a2bead10..cfc843c24 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@ $Id$
 $Source$
 
 2003-03-12 Garvin Hicking <me@supergarv.de>
+    * tbl_properties_options.php3, tbl_properties_table_info.php3: Support changing
+      auto_increment value. (RFE #639655)
     * db_printview.php3, tbl_printview.php3, db_datadict.php3, pdf_schema.php3:
       Display DB comments and MIME types, where appropriate.
     * header.inc.php3, querywindow.php3, libraries/common.lib.php3: Fixed some bugs for
diff --git a/tbl_properties_options.php3 b/tbl_properties_options.php3
index 08b24aaf8..6387ff827 100755
--- a/tbl_properties_options.php3
+++ b/tbl_properties_options.php3
@@ -29,7 +29,8 @@ if (isset($submitoptions)) {
     $sql_query     = 'ALTER TABLE ' . PMA_backquote($table)
                    . (isset($pack_keys) ? ' pack_keys=1': ' pack_keys=0')
                    . (isset($checksum) ? ' checksum=1': ' checksum=0')
-                   . (isset($delay_key_write) ? ' delay_key_write=1': ' delay_key_write=0');
+                   . (isset($delay_key_write) ? ' delay_key_write=1': ' delay_key_write=0')
+                   . (isset($auto_increment) ? ' auto_increment=' . PMA_sqlAddslashes($auto_increment) : '');
     $result        = PMA_mysql_query($sql_query) or PMA_mysqlDie('', $sql_query, '', $err_url);
     $message       = $strSuccess;
 }
@@ -39,13 +40,11 @@ if (isset($message)) {
     PMA_showMessage($message);
 }
 
-
 /**
  * Gets tables informations and displays top links
  */
 require('./tbl_properties_table_info.php3');
 
-
 /**
  * Displays form controls
  */
@@ -147,25 +146,26 @@ if (PMA_MYSQL_INT_VERSION >= 32322) {
                 <form method="post" action="tbl_properties_options.php3">
                     <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
 
-                    <table border="0" cellspacing="0" cellpadding="0">
+                    <table border="0" cellspacing="1" cellpadding="1">
                     <tr>
-                        <td>
-                            <input type="checkbox" name="pack_keys" id="pack_keys_opt"
-                                <?php echo (isset($pack_keys) && $pack_keys == 1) ? ' checked="checked"' : ''; ?> />
-                            <label for="pack_keys_opt">pack_keys</label>&nbsp;&nbsp;
-                            <br />
-                            <input type="checkbox" name="checksum" id="checksum_opt"
-                                <?php echo (isset($checksum) && $checksum == 1) ? ' checked="checked"' : ''; ?> />
-                            <label for="checksum_opt">checksum</label>&nbsp;&nbsp;
-                            <br />
-                            <input type="checkbox" name="delay_key_write" id="delay_key_write_opt"
-                                <?php echo (isset($delay_key_write) && $delay_key_write == 1) ? ' checked="checked"' : ''; ?> />
-                            <label for="delay_key_write_opt">delay_key_write</label>&nbsp;&nbsp;
-                            &nbsp;&nbsp;
-                        </td>
-                        <td>
-                            <input type="submit" name="submitoptions" value="<?php echo $strGo; ?>" />
-                        </td>
+                        <td align="right"><input type="checkbox" name="pack_keys" id="pack_keys_opt"
+                                <?php echo (isset($pack_keys) && $pack_keys == 1) ? ' checked="checked"' : ''; ?> /></td>
+                        <td><label for="pack_keys_opt">pack_keys</label>&nbsp;&nbsp;</td>
+                    </tr>
+                    <tr>
+                        <td align="right"><input type="checkbox" name="checksum" id="checksum_opt"
+                                <?php echo (isset($checksum) && $checksum == 1) ? ' checked="checked"' : ''; ?> /></td>
+                         <td><label for="checksum_opt">checksum</label>&nbsp;&nbsp;</td>
+                    </tr>
+                    <tr>
+                         <td align="right"><input type="checkbox" name="delay_key_write" id="delay_key_write_opt"
+                                <?php echo (isset($delay_key_write) && $delay_key_write == 1) ? ' checked="checked"' : ''; ?> /></td>
+                         <td><label for="delay_key_write_opt">delay_key_write</label>&nbsp;&nbsp;</td>
+                    </tr>
+                    <tr>
+                         <td><input type="text" name="auto_increment" id="auto_increment_opt" class="textfield" style="width: 30px"
+                                <?php echo (isset($auto_increment) && !empty($auto_increment) ? ' value="' . $auto_increment . '"' : ''); ?> /></td>
+                         <td valign="top"><label for="auto_increment_opt">auto_increment</label>&nbsp;&nbsp;<input type="submit" name="submitoptions" value="<?php echo $strGo; ?>" /></td>
                     </tr>
                     </table>
                 </form>
diff --git a/tbl_properties_table_info.php3 b/tbl_properties_table_info.php3
index 359f86366..a4abf8718 100755
--- a/tbl_properties_table_info.php3
+++ b/tbl_properties_table_info.php3
@@ -16,6 +16,7 @@ if (PMA_MYSQL_INT_VERSION >= 32303) {
     $tbl_type            = strtoupper($showtable['Type']);
     $table_info_num_rows = (isset($showtable['Rows']) ? $showtable['Rows'] : 0);
     $show_comment        = (isset($showtable['Comment']) ? $showtable['Comment'] : '');
+    $auto_increment      = (isset($showtable['Auto_increment']) ? $showtable['Auto_increment'] : '');
 
     $tmp                 = explode(' ', $showtable['Create_options']);
     $tmp_cnt             = count($tmp);