diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim
index 6d750e021..0d504d549 100644
--- a/src/testdir/test_gui.vim
+++ b/src/testdir/test_gui.vim
@@ -386,13 +386,18 @@ func Test_set_guifont()
   if has('win32')
     " Invalid font names are accepted in GTK GUI
     call assert_fails('set guifont=xa1bc23d7f', 'E596:')
+  endif
 
+  if exists('+renderoptions')
     " doing this four times used to cause a crash
-    set guifont=
-    set guifont=
-    set guifont=
-    set guifont=
-    set guifont=
+    set renderoptions=type:directx
+    for i in range(5)
+      set guifont=
+    endfor
+    set renderoptions=
+    for i in range(5)
+      set guifont=
+    endfor
   endif
 
   if has('xfontset')
diff --git a/src/version.c b/src/version.c
index 3d4863739..efb17f397 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2116,
 /**/
     2115,
 /**/