diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d27f64b14f..3216db6b57 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2012-10-23  Joel Brobecker  <brobecker@adacore.com>
+
+	* amd64-windows-tdep.c (amd64_windows_auto_wide_charset): New
+	function.
+	(amd64_windows_init_abi): Set auto_wide_charset gdbarch method
+	to amd64_windows_auto_wide_charset.
+
 2012-10-23  Yao Qi  <yao@codesourcery.com>
 
 	* event-top.c (mark_async_signal_handler_wrapper): Remove.
diff --git a/gdb/amd64-windows-tdep.c b/gdb/amd64-windows-tdep.c
index 528fbb6107..142e1413dd 100644
--- a/gdb/amd64-windows-tdep.c
+++ b/gdb/amd64-windows-tdep.c
@@ -190,6 +190,14 @@ amd64_windows_skip_trampoline_code (struct frame_info *frame, CORE_ADDR pc)
   return destination;
 }
 
+/* Implement the "auto_wide_charset" gdbarch method.  */
+
+static const char *
+amd64_windows_auto_wide_charset (void)
+{
+  return "UTF-16";
+}
+
 static void
 amd64_windows_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 {
@@ -215,6 +223,8 @@ amd64_windows_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
   set_gdbarch_iterate_over_objfiles_in_search_order
     (gdbarch, windows_iterate_over_objfiles_in_search_order);
 
+  set_gdbarch_auto_wide_charset (gdbarch, amd64_windows_auto_wide_charset);
+
   set_solib_ops (gdbarch, &solib_target_so_ops);
 }