diff --git a/src/misc1.c b/src/misc1.c
index 3482272060..69ede43ff2 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -1329,6 +1329,7 @@ open_line(dir, flags, second_line_indent)
 	    for (i = 0; i < padding; i++)
 	    {
 		STRCAT(leader, " ");
+		less_cols--;
 		newcol++;
 	    }
 	}
diff --git a/src/testdir/test68.in b/src/testdir/test68.in
index fcfc68c7b4..e79aed50d0 100644
--- a/src/testdir/test68.in
+++ b/src/testdir/test68.in
@@ -93,6 +93,16 @@ ENDTEST
    2bb
 }
 
+STARTTEST
+/mno pqr/
+:setl tw=20 fo=an12wcq comments=s1:/*,mb:*,ex:*/
+A vwx yz
+ENDTEST
+
+/* abc def ghi jkl 
+ *    mno pqr stu
+ */
+
 STARTTEST
 /^#/
 :setl tw=12 fo=tqnc comments=:#
diff --git a/src/testdir/test68.ok b/src/testdir/test68.ok
index 4c4a7c2697..7ec93e6358 100644
--- a/src/testdir/test68.ok
+++ b/src/testdir/test68.ok
@@ -57,6 +57,12 @@ a b
 { 1aa ^^2bb }
 
 
+/* abc def ghi jkl 
+ *    mno pqr stu 
+ *    vwx yz
+ */
+
+
 # 1 xxxxx
 #   foobar
 
diff --git a/src/version.c b/src/version.c
index ed205bbc3c..bf2cec904d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    612,
 /**/
     611,
 /**/