diff --git a/src/ops.c b/src/ops.c
index ecd7fc2170..9e8ea86160 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -249,25 +249,23 @@ shift_line(
 	}
 	else
 	    i += amount;
-	count = i * sw_val;
+	count = (long long)i * (long long)sw_val;
     }
     else		// original vi indent
     {
 	if (left)
 	{
-	    count -= sw_val * amount;
+	    count -= (long long)sw_val * (long long)amount;
 	    if (count < 0)
 		count = 0;
 	}
 	else
-	{
-	    if ((long long)sw_val * (long long)amount > INT_MAX - count)
-		count = INT_MAX;
-	    else
-		count += (long long)sw_val * (long long)amount;
-	}
+	    count += (long long)sw_val * (long long)amount;
     }
 
+    if (count > INT_MAX)
+	count = INT_MAX;
+
     // Set new indent
     if (State & VREPLACE_FLAG)
 	change_indent(INDENT_SET, (int)count, FALSE, NUL, call_changed_bytes);
diff --git a/src/version.c b/src/version.c
index 249cd11d20..00b532075c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2113,
 /**/
     2112,
 /**/