diff --git a/src/mbyte.c b/src/mbyte.c
index 134a956..b7114e8 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -3131,7 +3131,7 @@
 	else
 	    s = p + 1;
     }
-    for (i = 0; s[i] != NUL && s + i < buf + sizeof(buf) - 1; ++i)
+    for (i = 0; s[i] != NUL && i < sizeof(buf) - 1; ++i)
     {
 	if (s[i] == '_' || s[i] == '-')
 	    buf[i] = '-';
diff --git a/src/version.c b/src/version.c
index 3529bb0..b106c95 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    46,
+/**/
     45,
 /**/
     44,