diff --git a/contrib/less/search.c b/contrib/less/search.c
index 87e2a8c8f55f..4fb169c39d7e 100644
--- a/contrib/less/search.c
+++ b/contrib/less/search.c
@@ -120,13 +120,16 @@ cvt_length(len, ops)
 	int len;
 	int ops;
 {
-	if (utf_mode && (ops & CVT_TO_LC))
+	if (utf_mode)
 		/*
-		 * Converting case can cause a UTF-8 string to increase in length.
-		 * Multiplying by 3 is the worst case.
+		 * Just copying a string in UTF-8 mode can cause it to grow 
+		 * in length.
+		 * Six output bytes for one input byte is the worst case
+		 * (and unfortunately is far more than is needed in any 
+		 * non-pathological situation, so this is very wasteful).
 		 */
-		len *= 3;
-	return len+1;
+		len *= 6;
+	return len + 1;
 }
 
 /*