diff --git a/src/debugger.c b/src/debugger.c
index 54bf6ba..6c38e5a 100644
--- a/src/debugger.c
+++ b/src/debugger.c
@@ -989,7 +989,12 @@
 		}
 		else
 		{
-		    if (typval_compare(tv, bp->dbg_val, EXPR_IS, FALSE) == OK
+		    // Use "==" instead of "is" for strings, that is what we
+		    // always have done.
+		    exprtype_T	type = tv->v_type == VAR_STRING
+							? EXPR_EQUAL : EXPR_IS;
+
+		    if (typval_compare(tv, bp->dbg_val, type, FALSE) == OK
 			    && tv->vval.v_number == FALSE)
 		    {
 			typval_T *v;
diff --git a/src/version.c b/src/version.c
index 49810ea..7856aed 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4536,
+/**/
     4535,
 /**/
     4534,