diff --git a/ChangeLog b/ChangeLog
index 793ae7a..1c1a998 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-09-28 22:04  Alexander Malmberg  <alexander@malmberg.org>
+
+	* Source/art/ftfont.m: Add .font package handling again.
+
 2002-09-28 17:30  Alexander Malmberg  <alexander@malmberg.org>
 
 	* Source/art/ftfont.m (load_font_configuration): Handle the
diff --git a/Source/art/ftfont.m b/Source/art/ftfont.m
index c5009ed..8a54651 100644
--- a/Source/art/ftfont.m
+++ b/Source/art/ftfont.m
@@ -243,6 +243,7 @@ static NSArray *fix_path(NSString *path, NSArray *files)
   return nfiles;
 }
 
+/* TODO: handling of .font packages needs to be reworked */
 static void add_face(NSString *family, int family_weight,
 	unsigned int family_traits, NSDictionary *d, NSString *path,
 	BOOL from_nfont)
@@ -255,12 +256,6 @@ static void add_face(NSString *family, int family_weight,
   NSString *faceName, *rawFaceName;
 
 
-  if (!from_nfont)
-    {
-      NSLog(@".font not back in yet");
-      return;
-    }
-
   fontName = [d objectForKey: @"PostScriptName"];
   if (!fontName)
     {
@@ -308,6 +303,16 @@ static void add_face(NSString *family, int family_weight,
 			[NSBundle bundleForClass: fi->isa],nil) copy];
       fi->faceName = faceName;
     }
+  else if (!from_nfont)
+    { /* try to guess something for .font packages */
+      int dummy;
+      int split = traits_from_string(family,&dummy,&dummy);
+      rawFaceName = faceName = [family substringFromIndex: split];
+      family = [family substringToIndex: split];
+      faceName = [NSLocalizedStringFromTableInBundle(faceName,nil,
+			[NSBundle bundleForClass: fi->isa],nil) copy];
+      fi->faceName = faceName;
+    }
   else
     {
       NSLog(@"Warning: Can't find name for face %@ in %@!",fontName,path);
@@ -496,7 +501,8 @@ static void load_font_configuration(void)
 	      family,
 	      [family stringByAppendingPathExtension: @"afm"],
 	      nil],
-	    @"Files", /* TODO */
+	    @"Files",
+	    family,@"PostScriptName",
 	    nil];
 	  add_face(family, 5, 0, d, font_path, NO);
 	}