diff --git a/src/ChangeLog b/src/ChangeLog
index dbf5c94a87c..b242465cef3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-03-19  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* xfont.c (xfont_list_family): Mark var as initialized.
+
 	* xml.c (make_dom): Now static.
 
 	* composite.c (composition_compute_stop_pos): Rename local to
diff --git a/src/xfont.c b/src/xfont.c
index f8aace3663c..3e0fcd2cd75 100644
--- a/src/xfont.c
+++ b/src/xfont.c
@@ -629,7 +629,7 @@ xfont_list_family (Lisp_Object frame)
   char **names;
   int num_fonts, i;
   Lisp_Object list;
-  char *last_family;
+  char *last_family IF_LINT (= 0);
   int last_len;
 
   BLOCK_INPUT;