diff --git a/src/tag.c b/src/tag.c
index be80a11651..ba42f158c7 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -741,8 +741,10 @@ do_tag(tag, type, count, forceit, verbose)
 			    break;
 			msg_advance(15);
 
-			/* skip backslash used for escaping command char */
-			if (*p == '\\' && *(p + 1) == *tagp.command)
+			/* skip backslash used for escaping a command char or
+			 * a backslash */
+			if (*p == '\\' && (*(p + 1) == *tagp.command
+				        || *(p + 1) == '\\'))
 			    ++p;
 
 			if (*p == TAB)
diff --git a/src/version.c b/src/version.c
index b00297207a..472a7fad03 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    240,
 /**/
     239,
 /**/