diff --git a/modules/engines/ms-windows/ChangeLog.old b/modules/engines/ms-windows/ChangeLog.old
index 191a035dab..30ea5813e3 100755
--- a/modules/engines/ms-windows/ChangeLog.old
+++ b/modules/engines/ms-windows/ChangeLog.old
@@ -1,3 +1,10 @@
+2004-05-21  Raymond Penners  <raymond@dotsphinx.com>
+
+	* configure.in: Bump version number (0.6.0)
+	
+	* src/msw_style.c: Applied patch by John Ehresman that fixes a
+	memory leak.
+
 2004-05-21  Dom Lachowicz <cinamod@hotmail.com>
 
 	* src/Theme/gtk-2.0/gtkrc: Better icon sizes
diff --git a/modules/engines/ms-windows/msw_style.c b/modules/engines/ms-windows/msw_style.c
index 8d72ab6d61..fdb6d58347 100755
--- a/modules/engines/ms-windows/msw_style.c
+++ b/modules/engines/ms-windows/msw_style.c
@@ -519,8 +519,16 @@ setup_system_font(GtkStyle *style)
 {
   char buf[256], * font; /* It's okay, lfFaceName is smaller than 32 chars */
 
-  if ((font = sys_font_to_pango_font(XP_THEME_CLASS_TEXT, XP_THEME_FONT_MESSAGE, buf, sizeof (buf))) != NULL)
-    style->font_desc = pango_font_description_from_string(font);
+  if ((font = sys_font_to_pango_font(XP_THEME_CLASS_TEXT,
+                                     XP_THEME_FONT_MESSAGE,
+                                     buf, sizeof (buf))) != NULL)
+    {
+      if (style->font_desc)
+        {
+          pango_font_description_free (style->font_desc);
+        }
+      style->font_desc = pango_font_description_from_string(font);
+    }
 }
 
 static void