diff --git a/src/testdir/test_selectmode.vim b/src/testdir/test_selectmode.vim
index 3adb843cb8..3296f7e702 100644
--- a/src/testdir/test_selectmode.vim
+++ b/src/testdir/test_selectmode.vim
@@ -165,7 +165,10 @@ func Test_term_mouse_multiple_clicks_to_select_mode()
   let save_term = &term
   let save_ttymouse = &ttymouse
   call test_override('no_query_mouse', 1)
-  set mouse=a term=xterm mousetime=200
+
+  " 'mousetime' must be sufficiently large, or else the test is flaky when
+  " using a ssh connection with X forwarding; i.e. ssh -X.
+  set mouse=a term=xterm mousetime=1000
   set selectmode=mouse
   new
 
diff --git a/src/version.c b/src/version.c
index ef2f0cb31e..7b0771e7f0 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 */
+/**/
+    2610,
 /**/
     2609,
 /**/