diff --git a/src/normal.c b/src/normal.c
index 762f319..80ada68 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -4545,7 +4545,7 @@
     int		width2;		/* test width for wrapped screen line */
 
     oap->motion_type = MCHAR;
-    oap->inclusive = FALSE;
+    oap->inclusive = (curwin->w_curswant == MAXCOL);
 
     col_off1 = curwin_col_off();
     col_off2 = col_off1 - curwin_col_off2();
diff --git a/src/version.c b/src/version.c
index 59476e5..f02bf35 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    22,
+/**/
     21,
 /**/
     20,