diff --git a/src/normal.c b/src/normal.c
index cb1a7d1..74a001e 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -4457,6 +4457,8 @@
     col_off2 = col_off1 - curwin_col_off2();
     width1 = W_WIDTH(curwin) - col_off1;
     width2 = W_WIDTH(curwin) - col_off2;
+    if (width2 == 0)
+	width2 = 1; /* avoid divide by zero */
 
 #ifdef FEAT_VERTSPLIT
     if (curwin->w_width != 0)
diff --git a/src/version.c b/src/version.c
index 17e442f..72d85b6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    606,
+/**/
     605,
 /**/
     604,