diff --git a/.gitattributes b/.gitattributes
index 9c40b62821880f4815fc0f3880af1f0628b903df..255a76c51588c75b751971b8a428d142cdaee7e7 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -22,6 +22,7 @@ testfont binary
 /Makefile foreign_ident
 /NT/tools/install-sh foreign_ident
 /bin/export.pike foreign_ident
+/bin/feature_list foreign_ident
 /bin/httpd.pike foreign_ident
 /bin/make_ci.pike foreign_ident
 /bin/mkpeep.pike foreign_ident
diff --git a/bin/feature_list b/bin/feature_list
index 2cbb27e4eb0222693a7b66ce88b788406e1f7b20..2dd7926583e2fbb901e855e405a9c5c8cc4b8d6b 100755
--- a/bin/feature_list
+++ b/bin/feature_list
@@ -1,5 +1,7 @@
 #!/usr/local/bin/pike
 
+// $Id: feature_list,v 1.8 2000/01/19 19:23:24 grubba Exp $
+
 int main(int argc, string *argv)
 {
   write("Features: ");
@@ -15,10 +17,12 @@ int main(int argc, string *argv)
 	     "_Image_TIFF","_Image_TTF","MIME","Msql","Mysql","Odbc","Oracle",
 	     "Perl", "Postgres","Ssleay","WideValues","X","Yp" }),
 	  string modname) {
-    catch { if (sizeof(indices(master()->resolv(modname))))
-      if(modname[0] == '_')
-	modname = replace(modname[1..], "_", ".");;
-      write(modname+" ");
+    catch {
+      if (sizeof(indices(master()->resolv(modname) || ({})))) {
+	if(modname[0] == '_')
+	  modname = replace(modname[1..], "_", ".");
+	write(modname+" ");
+      }
     };
   }