diff --git a/src/option.c b/src/option.c
index 7e36240..93e3c39 100644
--- a/src/option.c
+++ b/src/option.c
@@ -1711,7 +1711,7 @@
 #else
 			    (char_u *)NULL, PV_NONE,
 #endif
-			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+			    {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
     {"laststatus",  "ls",   P_NUM|P_VI_DEF|P_RALL,
 #ifdef FEAT_WINDOWS
 			    (char_u *)&p_ls, PV_NONE,
diff --git a/src/testdir/test_mapping.vim b/src/testdir/test_mapping.vim
index 66b81ce..306eb2f 100644
--- a/src/testdir/test_mapping.vim
+++ b/src/testdir/test_mapping.vim
@@ -72,6 +72,14 @@
   set nolangremap
   call assert_equal(1, &langnoremap)
 
+  " check default values
+  set langnoremap&
+  call assert_equal(0, &langnoremap)
+  call assert_equal(1, &langremap)
+  set langremap&
+  call assert_equal(0, &langnoremap)
+  call assert_equal(1, &langremap)
+
   " langmap should not apply in insert mode, 'langremap' doesn't matter
   set langmap=+{ nolangremap
   call feedkeys("Go+\<Esc>", "xt")
diff --git a/src/version.c b/src/version.c
index fa045f6..d68b76c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2306,
+/**/
     2305,
 /**/
     2304,