diff --git a/mysql/edit_cnf.cgi b/mysql/edit_cnf.cgi
index 515365e59..bd5a88811 100755
--- a/mysql/edit_cnf.cgi
+++ b/mysql/edit_cnf.cgi
@@ -54,6 +54,10 @@ $fpt = &find_value("innodb_file_per_table", $mems);
 print &ui_table_row($text{'cnf_fpt'},
 		    &ui_yesno_radio("fpt", $fpt));
 
+$ilt = &find_value("innodb_lock_wait_timeout", $mems);
+print &ui_table_row($text{'cnf_ilt'},
+		    &ui_opt_textbox("ilt", $ilt, 10, $text{'default'}));
+
 # Show set variables
 print &ui_table_hr();
 
diff --git a/mysql/lang/en b/mysql/lang/en
index ffb0e987f..34959020b 100644
--- a/mysql/lang/en
+++ b/mysql/lang/en
@@ -740,6 +740,8 @@ cnf_emyisam_sort_buffer_size=Missing or invalid MyISAM sort buffer size
 cnf_emax_connections=Missing or invalid maximum number of connections
 cnf_restart=Save and Restart MySQL
 cnf_fpt=Separate file for each InnoDB table?
+cnf_ilt=InnoDB lock timeout (in seconds)
+cnf_eilt=InnoDB lock timeout must be an integer
 
 manual_title=Edit Config Files
 manual_file=Edit config file:
diff --git a/mysql/save_cnf.cgi b/mysql/save_cnf.cgi
index 7ab1cbe36..d7442af81 100755
--- a/mysql/save_cnf.cgi
+++ b/mysql/save_cnf.cgi
@@ -59,6 +59,15 @@ if ($fpt || $in{'fpt'}) {
 			[ $in{'fpt'} ]);
 	}
 
+if ($in{'ilt_def'}) {
+	&save_directive($conf, $mysqld, "innodb_lock_wait_timeout", [ ]);
+	}
+else {
+	$in{'ilt'} =~ /^\d+$/ || &error($text{'cnf_eilt'});
+	&save_directive($conf, $mysqld, "innodb_lock_wait_timeout",
+			[ $in{'ilt'} ]);
+	}
+
 &save_directive($conf, $mysqld, "big-tables",
 		$in{'big-tables'} ? [ "" ] : [ ]);