diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index 26b588c..8a11fbb 100644
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -3749,6 +3749,7 @@
 ex_options(
     exarg_T	*eap UNUSED)
 {
+    vim_setenv((char_u *)"OPTWIN_CMD", (char_u *)(cmdmod.tab ? "tab" : ""));
     cmd_source((char_u *)SYS_OPTWIN_FILE, NULL);
 }
 #endif
diff --git a/src/version.c b/src/version.c
index 707be4f..9e3764e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    900,
+/**/
     899,
 /**/
     898,