diff --git a/jnlib/ChangeLog b/jnlib/ChangeLog
index e4df12a7f..db9b68d0d 100644
--- a/jnlib/ChangeLog
+++ b/jnlib/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-18  Werner Koch  <wk@g10code.de>
+
+	* stringhelp.c (print_sanitized_utf8_string): Actually implement
+	it.
+
 2004-06-21  Werner Koch  <wk@g10code.com>
 
 	* logging.c (log_set_file): Do not close an old logstream if it
diff --git a/jnlib/stringhelp.c b/jnlib/stringhelp.c
index 4c8ab314b..568152fdd 100644
--- a/jnlib/stringhelp.c
+++ b/jnlib/stringhelp.c
@@ -392,8 +392,9 @@ print_sanitized_string (FILE *fp, const char *string, int delim)
 size_t 
 print_sanitized_utf8_string (FILE *fp, const char *string, int delim)
 {
-  /* FIXME: convert to local characterset */
-  return print_sanitized_string (fp, string, delim);
+  return string? print_sanitized_utf8_buffer (fp,
+                                              string, strlen (string),
+                                              delim) : 0;
 }
 
 /* Create a string from the buffer P of length N which is suitable for