diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 576a75674a..ed7512f769 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -2384,6 +2384,7 @@ do_one_cmd(
 	    case CMD_leftabove:
 	    case CMD_let:
 	    case CMD_lockmarks:
+	    case CMD_lockvar:
 	    case CMD_lua:
 	    case CMD_match:
 	    case CMD_mzscheme:
@@ -2408,6 +2409,7 @@ do_one_cmd(
 	    case CMD_tilde:
 	    case CMD_topleft:
 	    case CMD_unlet:
+	    case CMD_unlockvar:
 	    case CMD_verbose:
 	    case CMD_vertical:
 	    case CMD_wincmd:
diff --git a/src/testdir/test_const.vim b/src/testdir/test_const.vim
index 8df34f4ad6..7f950910b3 100644
--- a/src/testdir/test_const.vim
+++ b/src/testdir/test_const.vim
@@ -203,6 +203,20 @@ func Test_const_with_condition()
   call assert_equal(0, x)
 endfunc
 
+func Test_lockvar()
+  let x = 'hello'
+  lockvar x
+  call assert_fails('let x = "there"', 'E741')
+  if 0 | unlockvar x | endif
+  call assert_fails('let x = "there"', 'E741')
+  unlockvar x
+  let x = 'there'
+
+  if 0 | lockvar x | endif
+  let x = 'again'
+endfunc
+
+
 func Test_const_with_index_access()
     let l = [1, 2, 3]
     call assert_fails('const l[0] = 4', 'E996:')
diff --git a/src/version.c b/src/version.c
index 70df145126..36e43a849c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -737,6 +737,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2349,
 /**/
     2348,
 /**/