diff --git a/ChangeLog b/ChangeLog
index 070fac1824..65035dd380 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1998-05-20  Ulrich Drepper  <drepper@cygnus.com>
+
+	* stdio-common/vfprintf.c: When precision is specified for %ls or
+	%S handle it correctly.
+
 1998-05-20  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
 
 	* sysdeps/unix/bsd/vax/vfork.S: Missed double occurences of "the
diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index dcc5cdbdaa..ef9165e448 100644
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -890,8 +890,9 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
 	    assert (__mbsinit (&mbstate));				      \
 	    s2 = (const wchar_t *) string;				      \
 	    string = alloca (len + 1);					      \
-	    (void) __wcsrtombs (string, &s2, prec != -1 ? prec : UINT_MAX,    \
-				&mbstate);				      \
+	    (void) __wcsrtombs (string, &s2, len + 1, &mbstate);	      \
+	    if (prec < min)						      \
+	      len = prec;						      \
 	  }								      \
 									      \
 	if ((width -= len) < 0)						      \