diff --git a/ChangeLog b/ChangeLog
index 3329b8ef..f7ec7fac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-18  David Lawrence Ramsey  <pooka109@gmail.com>
+
+	* nano.c (print_opt_full): Use strlenpt() instead of strlen(),
+	so that tabs are placed properly when displaying translated
+	strings in UTF-8, as found by Jean-Philippe Guérard.
+
 2007-12-17  David Lawrence Ramsey  <pooka109@gmail.com>
 
 	* configure.ac, doc/texinfo/nano.texi, nano.c (terminal_init):
diff --git a/src/nano.c b/src/nano.c
index 6ec46014..b676fc93 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -752,14 +752,14 @@ void print_opt_full(const char *shortflag
 	, const char *desc)
 {
     printf(" %s\t", shortflag);
-    if (strlen(shortflag) < 8)
+    if (strlenpt(shortflag) < 8)
 	printf("\t");
 
 #ifdef HAVE_GETOPT_LONG
     printf("%s\t", longflag);
-    if (strlen(longflag) < 8)
+    if (strlenpt(longflag) < 8)
 	printf("\t\t");
-    else if (strlen(longflag) < 16)
+    else if (strlenpt(longflag) < 16)
 	printf("\t");
 #endif