diff --git a/ChangeLog b/ChangeLog
index 7e338d0..5ee8fab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-02-13  Mike Fabian  <mfabian@suse.de>
+	reviewed by: plam
+	* src/fcfreetype.c (FcFreeTypeQuery):
+
+	Skip bitmap fonts which can't even get it together enough to
+	declare a family name; this appears to reproduce previous
+	fontconfig behaviour.
+
 2006-02-10  Takashi Iwai  <tiwai@suse.de>
 	reviewed by: plam
 	* src/fccache.c (FcDirCacheOpen):
diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index 27dff11..9dc45fc 100644
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -1609,6 +1609,11 @@ FcFreeTypeQuery (const FcChar8	*file,
             int value;
             BDF_PropertyRec prop;
 
+	    /* skip bitmap fonts which do not even have a family name */
+	    rc =  FT_Get_BDF_Property(face, "FAMILY_NAME", &prop);
+	    if (rc != 0 || prop.type != BDF_PROPERTY_TYPE_ATOM)
+		goto bail2;
+
             rc = FT_Get_BDF_Property(face, "POINT_SIZE", &prop);
             if(rc == 0 && prop.type == BDF_PROPERTY_TYPE_INTEGER)
                 value = prop.u.integer;