diff --git a/builds/cygwin/devel/freetype/config/ftoption.h b/builds/cygwin/devel/freetype/config/ftoption.h
index a06648b58..03faeb350 100644
--- a/builds/cygwin/devel/freetype/config/ftoption.h
+++ b/builds/cygwin/devel/freetype/config/ftoption.h
@@ -357,7 +357,9 @@
   /* T1_MAX_CHARSTRING_OPERANDS is the charstring stack's capacity.  A     */
   /* minimum of 16 is required.                                            */
   /*                                                                       */
-#define T1_MAX_CHARSTRINGS_OPERANDS  64
+  /* The Chinese font MingTiEG-Medium (CNS 11643 character set) needs 256. */
+  /*                                                                       */
+#define T1_MAX_CHARSTRINGS_OPERANDS  256
 
 
   /*************************************************************************/
diff --git a/builds/freetype.mk b/builds/freetype.mk
index ab16bd581..67489ffb1 100644
--- a/builds/freetype.mk
+++ b/builds/freetype.mk
@@ -154,7 +154,8 @@ OBJECTS_LIST :=
 #
 PUBLIC_H   := $(wildcard $(PUBLIC_)*.h)
 BASE_H     := $(wildcard $(INTERNAL_)*.h)
-CONFIG_H   := $(wildcard $(CONFIG_)*.h)
+CONFIG_H   := $(wildcard $(CONFIG_)*.h) \
+              $(wildcard $(BUILD)$(SEP)freetype$(SEP)config$(SEP)*.h)
 CACHE_H    := $(wildcard $(CACHE_)*.h)
 
 FREETYPE_H := $(PUBLIC_H) $(BASE_H) $(CONFIG_H) $(CACHE_H)
diff --git a/builds/unix/devel/freetype/config/ftoption.h b/builds/unix/devel/freetype/config/ftoption.h
index a06648b58..03faeb350 100644
--- a/builds/unix/devel/freetype/config/ftoption.h
+++ b/builds/unix/devel/freetype/config/ftoption.h
@@ -357,7 +357,9 @@
   /* T1_MAX_CHARSTRING_OPERANDS is the charstring stack's capacity.  A     */
   /* minimum of 16 is required.                                            */
   /*                                                                       */
-#define T1_MAX_CHARSTRINGS_OPERANDS  64
+  /* The Chinese font MingTiEG-Medium (CNS 11643 character set) needs 256. */
+  /*                                                                       */
+#define T1_MAX_CHARSTRINGS_OPERANDS  256
 
 
   /*************************************************************************/
diff --git a/builds/unix/unixddef.mk b/builds/unix/unixddef.mk
index 242e96579..0ddc6c561 100644
--- a/builds/unix/unixddef.mk
+++ b/builds/unix/unixddef.mk
@@ -22,7 +22,8 @@ TOP := $(shell cd $(TOP); pwd)
 DELETE   := rm -f
 SEP      := /
 HOSTSEP  := $(SEP)
-BUILD    := $(TOP)/builds/unix/devel # we use a special devel ftoption.h
+# we use a special devel ftoption.h
+BUILD    := $(TOP)/builds/unix/devel
 # do not set the platform to `unix', or libtool will trick you
 PLATFORM := unixdev
 
diff --git a/builds/win32/devel/freetype/config/ftoption.h b/builds/win32/devel/freetype/config/ftoption.h
index a06648b58..8b09800ed 100644
--- a/builds/win32/devel/freetype/config/ftoption.h
+++ b/builds/win32/devel/freetype/config/ftoption.h
@@ -357,6 +357,8 @@
   /* T1_MAX_CHARSTRING_OPERANDS is the charstring stack's capacity.  A     */
   /* minimum of 16 is required.                                            */
   /*                                                                       */
+  /* The Chinese font MingTiEG-Medium (CNS 11643 character set) needs 256. */
+  /*                                                                       */
 #define T1_MAX_CHARSTRINGS_OPERANDS  64
 
 
diff --git a/builds/win32/w32-dev.mk b/builds/win32/w32-dev.mk
index fc3ed10d0..28146d889 100644
--- a/builds/win32/w32-dev.mk
+++ b/builds/win32/w32-dev.mk
@@ -23,7 +23,9 @@ ifndef TOP
   TOP := .
 endif
 
-SEP := /
+SEP   := /
+BUILD := $(TOP)/builds/win32/devel
+
 include $(TOP)/builds/win32/win32-def.mk
 include $(TOP)/builds/compiler/gcc-dev.mk
 
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
index d51258709..2e4330d27 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -357,7 +357,9 @@
   /* T1_MAX_CHARSTRING_OPERANDS is the charstring stack's capacity.  A     */
   /* minimum of 16 is required.                                            */
   /*                                                                       */
-#define T1_MAX_CHARSTRINGS_OPERANDS  64
+  /* The Chinese font MingTiEG-Medium (CNS 11643 character set) needs 256. */
+  /*                                                                       */
+#define T1_MAX_CHARSTRINGS_OPERANDS  256
 
 
   /*************************************************************************/
diff --git a/include/freetype/internal/psaux.h b/include/freetype/internal/psaux.h
index 0e70de48d..83ac00c55 100644
--- a/include/freetype/internal/psaux.h
+++ b/include/freetype/internal/psaux.h
@@ -520,9 +520,6 @@
 
 #if 0
 
-#define T1_MAX_CHARSTRINGS_OPERANDS  64
-#define T1_MAX_SUBRS_CALLS           16
-
   /*************************************************************************/
   /*                                                                       */
   /* T1_MAX_SUBRS_CALLS details the maximum number of nested sub-routine   */