diff --git a/utf8-combined.c b/utf8-combined.c
index e1b7934f..26bd9131 100644
--- a/utf8-combined.c
+++ b/utf8-combined.c
@@ -1035,7 +1035,7 @@ utf8_build_combined(void)
 		wc = utf8_combined_table[i].first;
 		mlen = wctomb(first.data, wc);
 		if (mlen <= 0 || mlen > UTF8_SIZE) {
-			log_debug("invalid combined character %08X", wc);
+			log_debug("invalid combined character %05X", wc);
 			continue;
 		}
 		first.size = mlen;
diff --git a/utf8.c b/utf8.c
index 202dda7f..282eb7bd 100644
--- a/utf8.c
+++ b/utf8.c
@@ -229,10 +229,10 @@ utf8_width(struct utf8_data *ud, int *width)
 	case 0:
 		return (UTF8_ERROR);
 	}
-	log_debug("UTF-8 %.*s is %08X", (int)ud->size, ud->data, (u_int)wc);
+	log_debug("UTF-8 %.*s is %05X", (int)ud->size, ud->data, (u_int)wc);
 #ifdef HAVE_UTF8PROC
 	*width = utf8proc_wcwidth(wc);
-	log_debug("utf8proc_wcwidth(%08X) returned %d", (u_int)wc, *width);
+	log_debug("utf8proc_wcwidth(%05X) returned %d", (u_int)wc, *width);
 #else
 	*width = wcwidth(wc);
 	log_debug("wcwidth(%05X) returned %d", (u_int)wc, *width);