diff --git a/ChangeLog b/ChangeLog
index da669dfe1..6c60e5fdd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-23  Chia-I Wu  <b90201047@ntu.edu.tw>
+
+	* src/psaux/psaux.c src/psaux/psauxmod.c src/type1/t1driver.c: Make
+	AFM parser optional, controlled by `T1_CONFIG_OPTION_NO_AFM'.
+
 2006-01-22  Werner Lemberg  <wl@gnu.org>
 
 	* builds/unix/install-sh, builds/unix/mkinstalldirs: Updated from
diff --git a/src/psaux/psaux.c b/src/psaux/psaux.c
index 9dddc7080..a4b9c5c6e 100644
--- a/src/psaux/psaux.c
+++ b/src/psaux/psaux.c
@@ -23,7 +23,11 @@
 #include "psauxmod.c"
 #include "t1decode.c"
 #include "t1cmap.c"
+
+#ifndef T1_CONFIG_OPTION_NO_AFM
 #include "afmparse.c"
+#endif
+
 #include "psconv.c"
 
 
diff --git a/src/psaux/psauxmod.c b/src/psaux/psauxmod.c
index b69304a15..bbb6c01ed 100644
--- a/src/psaux/psauxmod.c
+++ b/src/psaux/psauxmod.c
@@ -21,7 +21,10 @@
 #include "psobjs.h"
 #include "t1decode.h"
 #include "t1cmap.h"
+
+#ifndef T1_CONFIG_OPTION_NO_AFM
 #include "afmparse.h"
+#endif
 
 
   FT_CALLBACK_TABLE_DEF
@@ -76,6 +79,7 @@
   };
 
 
+#ifndef T1_CONFIG_OPTION_NO_AFM
   FT_CALLBACK_TABLE_DEF
   const AFM_Parser_FuncsRec  afm_parser_funcs =
   {
@@ -83,6 +87,7 @@
     afm_parser_done,
     afm_parser_parse
   };
+#endif
 
 
   FT_CALLBACK_TABLE_DEF
@@ -102,7 +107,11 @@
     &ps_parser_funcs,
     &t1_builder_funcs,
     &t1_decoder_funcs,
+#ifndef T1_CONFIG_OPTION_NO_AFM
     &afm_parser_funcs,
+#else
+    0,
+#endif
 
     t1_decrypt,
     
diff --git a/src/type1/t1driver.c b/src/type1/t1driver.c
index 96ed45c3d..09be57db3 100644
--- a/src/type1/t1driver.c
+++ b/src/type1/t1driver.c
@@ -178,10 +178,12 @@
     (PS_GetFontPrivateFunc)t1_ps_get_font_private,
   };
 
+#ifndef T1_CONFIG_OPTION_NO_AFM
   static const FT_Service_KerningRec  t1_service_kerning =
   {
     T1_Get_Track_Kerning,
   };
+#endif
 
  /*
   *  SERVICE LIST
@@ -194,7 +196,10 @@
     { FT_SERVICE_ID_GLYPH_DICT,           &t1_service_glyph_dict },
     { FT_SERVICE_ID_XF86_NAME,            FT_XF86_FORMAT_TYPE_1 },
     { FT_SERVICE_ID_POSTSCRIPT_INFO,      &t1_service_ps_info },
+
+#ifndef T1_CONFIG_OPTION_NO_AFM
     { FT_SERVICE_ID_KERNING,              &t1_service_kerning },
+#endif
 
 #ifndef T1_CONFIG_OPTION_NO_MM_SUPPORT
     { FT_SERVICE_ID_MULTI_MASTERS,        &t1_service_multi_masters },