diff --git a/src/term.c b/src/term.c
index 38fc89b..3efa7a7 100644
--- a/src/term.c
+++ b/src/term.c
@@ -4079,24 +4079,22 @@
 
 		    if (tp[1 + (tp[0] != CSI)] == '>' && j == 2)
 		    {
+			/* Only set 'ttymouse' automatically if it was not set
+			 * by the user already. */
+			if (!option_was_set((char_u *)"ttym"))
+			{
 # ifdef TTYM_SGR
-			if (extra >= 277
-# ifdef TTYM_URXVT
-				&& ttym_flags != TTYM_URXVT
-# endif
-				)
-			    set_option_value((char_u *)"ttym", 0L,
+			    if (extra >= 277)
+				set_option_value((char_u *)"ttym", 0L,
 							  (char_u *)"sgr", 0);
-                        else
+			    else
 # endif
-			/* if xterm version >= 95 use mouse dragging */
-			if (extra >= 95
-# ifdef TTYM_URXVT
-				&& ttym_flags != TTYM_URXVT
-# endif
-				)
-			    set_option_value((char_u *)"ttym", 0L,
+			    /* if xterm version >= 95 use mouse dragging */
+			    if (extra >= 95)
+				set_option_value((char_u *)"ttym", 0L,
 						       (char_u *)"xterm2", 0);
+			}
+
 			/* if xterm version >= 141 try to get termcap codes */
 			if (extra >= 141)
 			{
diff --git a/src/version.c b/src/version.c
index 6613e50..e0404d0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -720,6 +720,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    699,
+/**/
     698,
 /**/
     697,