diff --git a/src/normal.c b/src/normal.c
index 344bd7d..bd6f1f2 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -4533,6 +4533,7 @@
 		}
 		curwin->w_cursor.lnum++;
 		curwin->w_curswant %= width2;
+		linelen = linetabsize(ml_get_curline());
 	    }
 	}
       }
diff --git a/src/version.c b/src/version.c
index dd16231..81ab3f7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    228,
+/**/
     227,
 /**/
     226,