diff --git a/src/ChangeLog b/src/ChangeLog
index d541b5d13e1..7218e726e07 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2001-10-18  Andrew Innes  <andrewi@gnu.org>
 
+	* fontset.c (fs_load_font) [WINDOWSNT && _MSC_VER]: Disable
+	optimization.  The fontp->encoding array was not being initialized
+	correctly when compiled with optimizations by MSVC.
+
 	* fontset.h (struct font_info) [WINDOWSNT]: Add codepage field.
 
 	* w32fns.c (w32_load_system_font): Cache codepage in font_info.
diff --git a/src/fontset.c b/src/fontset.c
index 5e359ddef8f..e8232e8de1b 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -569,6 +569,10 @@ fontset_font_pattern (f, id, c)
 }
 
 
+#if defined(WINDOWSNT) && defined (_MSC_VER)
+#pragma optimize("", off)
+#endif
+
 /* Load a font named FONTNAME to display character C on frame F.
    Return a pointer to the struct font_info of the loaded font.  If
    loading fails, return NULL.  If FACE is non-zero and a fontset is
@@ -694,6 +698,10 @@ fs_load_font (f, c, fontname, id, face)
   return fontp;
 }
 
+#if defined(WINDOWSNT) && defined (_MSC_VER)
+#pragma optimize("", on)
+#endif
+
 
 /* Cache data used by fontset_pattern_regexp.  The car part is a
    pattern string containing at least one wild card, the cdr part is