diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
index 30f08178d..ab9efbe3e 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -527,13 +527,14 @@ FT_BEGIN_HEADER
   /*   FT_CONFIG_OPTION_PIC, which is only necessary for very special      */
   /*   compilers.]                                                         */
   /*                                                                       */
-  /*   Note that PIC support is not available for all modules (see         */
-  /*   `modules.cfg' for a complete list).  For building with PIC support, */
-  /*   do the following.                                                   */
+  /*   Note that FT_CONFIG_OPTION_PIC support is not available for all     */
+  /*   modules (see `modules.cfg' for a complete list).  For building with */
+  /*   FT_CONFIG_OPTION_PIC support, do the following.                     */
   /*                                                                       */
-  /*     1. Clone the repository.                                          */
-  /*     2. Remove all subdirectories in `src' that don't have PIC         */
-  /*        support.                                                       */
+  /*     0. Clone the repository.                                          */
+  /*     1. Define FT_CONFIG_OPTION_PIC.                                   */
+  /*     2. Remove all subdirectories in `src' that don't have             */
+  /*        FT_CONFIG_OPTION_PIC support.                                  */
   /*     3. Comment out the corresponding modules in `modules.cfg'.        */
   /*     4. Compile.                                                       */
   /*                                                                       */
diff --git a/modules.cfg b/modules.cfg
index cac51f9ae..f30049c38 100644
--- a/modules.cfg
+++ b/modules.cfg
@@ -37,7 +37,7 @@ FONT_MODULES += truetype
 # PostScript Type 1 font driver.
 #
 # This driver needs the `psaux', `pshinter', and `psnames' modules.
-# No PIC support.
+# No FT_CONFIG_OPTION_PIC support.
 FONT_MODULES += type1
 
 # CFF/OpenType font driver.
@@ -48,30 +48,30 @@ FONT_MODULES += cff
 # Type 1 CID-keyed font driver.
 #
 # This driver needs the `psaux', `pshinter', and `psnames' modules.
-# No PIC support.
+# No FT_CONFIG_OPTION_PIC support.
 FONT_MODULES += cid
 
 # PFR/TrueDoc font driver.  See optional extension ftpfr.c below also.
-# No PIC support.
+# No FT_CONFIG_OPTION_PIC support.
 FONT_MODULES += pfr
 
 # PostScript Type 42 font driver.
 #
 # This driver needs the `truetype' and `psaux' modules.
-# No PIC support.
+# No FT_CONFIG_OPTION_PIC support.
 FONT_MODULES += type42
 
 # Windows FONT/FNT font driver.  See optional extension ftwinfnt.c below
 # also.
-# No PIC support.
+# No FT_CONFIG_OPTION_PIC support.
 FONT_MODULES += winfonts
 
 # PCF font driver.
-# No PIC support.
+# No FT_CONFIG_OPTION_PIC support.
 FONT_MODULES += pcf
 
 # BDF font driver.  See optional extension ftbdf.c below also.
-# No PIC support.
+# No FT_CONFIG_OPTION_PIC support.
 FONT_MODULES += bdf
 
 # SFNT files support.  If used without `truetype' or `cff', it supports
@@ -114,41 +114,41 @@ RASTER_MODULES += smooth
 # FreeType's cache sub-system (quite stable but still in beta -- this means
 # that its public API is subject to change if necessary).  See
 # include/freetype/ftcache.h.  Needs ftglyph.c.
-# No PIC support.
+# No FT_CONFIG_OPTION_PIC support.
 AUX_MODULES += cache
 
 # TrueType GX/AAT table validation.  Needs ftgxval.c below.
 #
-# No PIC support.
+# No FT_CONFIG_OPTION_PIC support.
 # AUX_MODULES += gxvalid
 
 # Support for streams compressed with gzip (files with suffix .gz).
 #
 # See include/freetype/ftgzip.h for the API.
-# No PIC support.
+# No FT_CONFIG_OPTION_PIC support.
 AUX_MODULES += gzip
 
 # Support for streams compressed with LZW (files with suffix .Z).
 #
 # See include/freetype/ftlzw.h for the API.
-# No PIC support.
+# No FT_CONFIG_OPTION_PIC support.
 AUX_MODULES += lzw
 
 # Support for streams compressed with bzip2 (files with suffix .bz2).
 #
 # See include/freetype/ftbzip2.h for the API.
-# No PIC support.
+# No FT_CONFIG_OPTION_PIC support.
 AUX_MODULES += bzip2
 
 # OpenType table validation.  Needs ftotval.c below.
 #
-# No PIC support.
+# No FT_CONFIG_OPTION_PIC support.
 # AUX_MODULES += otvalid
 
 # Auxiliary PostScript driver component to share common code.
 #
 # This module depends on `psnames'.
-# No PIC support.
+# No FT_CONFIG_OPTION_PIC support.
 AUX_MODULES += psaux
 
 # Support for PostScript glyph names.