diff --git a/protob/messages.proto b/protob/messages.proto
index f40469bb9..e1b81495b 100644
--- a/protob/messages.proto
+++ b/protob/messages.proto
@@ -175,6 +175,7 @@ message ApplySettings {
 	optional bool use_passphrase = 3;
 	optional bytes homescreen = 4;
 	optional PassphraseSourceType passphrase_source = 5;
+	optional uint32 auto_lock_delay_ms = 6;
 }
 
 /**
diff --git a/protob/storage.proto b/protob/storage.proto
index bb3789b6e..c04aa4b7d 100644
--- a/protob/storage.proto
+++ b/protob/storage.proto
@@ -29,4 +29,5 @@ message Storage {
 	optional uint32 flags = 13;			// device flags
 	optional HDNodeType u2froot = 14;		// U2F root node
 	optional bool unfinished_backup = 15;		// seed was improperly backed up
+	optional uint32 auto_lock_delay_ms = 16;	// configurable auto-lock delay (in milliseconds)
 }