diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8ad8186979..2ac0ecdd3f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-18  Tom Tromey  <tromey@redhat.com>
+
+	* valprint.c (generic_emit_char, generic_printstr): Pass size of
+	gdb_wchar_t to convert_between_encodings.
+
 2012-10-17  Yao Qi  <yao@codesourcery.com>
 
 	* breakpoint.c (invalidate_bp_value_on_memory_change): Add one
diff --git a/gdb/valprint.c b/gdb/valprint.c
index 6e651f6ce8..583329d3ba 100644
--- a/gdb/valprint.c
+++ b/gdb/valprint.c
@@ -2037,7 +2037,7 @@ generic_emit_char (int c, struct type *type, struct ui_file *stream,
   convert_between_encodings (INTERMEDIATE_ENCODING, host_charset (),
 			     obstack_base (&wchar_buf),
 			     obstack_object_size (&wchar_buf),
-			     1, &output, translit_char);
+			     sizeof (gdb_wchar_t), &output, translit_char);
   obstack_1grow (&output, '\0');
 
   fputs_filtered (obstack_base (&output), stream);
@@ -2278,7 +2278,7 @@ generic_printstr (struct ui_file *stream, struct type *type,
   convert_between_encodings (INTERMEDIATE_ENCODING, host_charset (),
 			     obstack_base (&wchar_buf),
 			     obstack_object_size (&wchar_buf),
-			     1, &output, translit_char);
+			     sizeof (gdb_wchar_t), &output, translit_char);
   obstack_1grow (&output, '\0');
 
   fputs_filtered (obstack_base (&output), stream);