diff --git a/src/ChangeLog b/src/ChangeLog
index c0b17d0d867..6588549e496 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-22  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* xsettings.c (read_and_apply_settings): Check if current_font is
+	NULL before strcmp (Bug#6001).
+
 2010-04-21  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	Clean up HP-UX files.
diff --git a/src/xsettings.c b/src/xsettings.c
index 2dd7f70eb60..4d128f19dd2 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -578,7 +578,7 @@ read_and_apply_settings (dpyinfo, send_event_p)
 
   if (settings.seen & SEEN_FONT)
     {
-      if (strcmp (current_font, settings.font) != 0) 
+      if (!current_font || strcmp (current_font, settings.font) != 0) 
         {
           free (current_font);
           current_font = settings.font;