diff --git a/ChangeLog b/ChangeLog
index ceb6166b3..25f771b08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2016-02-15  Werner Lemberg  <wl@gnu.org>
+
+	[cff] Handle T2 operator only with old CFF engine (#47157).
+
+	* src/cff/cffparse.c (cff_parser_run) <opcode 31>: Enclose with
+	#ifdef CFF_CONFIG_OPTION_OLD_ENGINE...#endif.
+
 2016-02-15  Werner Lemberg  <wl@gnu.org>
 
 	[cff] Partially handle `load' and `store' ops in old CFF engine.
diff --git a/src/cff/cffparse.c b/src/cff/cffparse.c
index 921c1a13c..9b935c339 100644
--- a/src/cff/cffparse.c
+++ b/src/cff/cffparse.c
@@ -1049,6 +1049,7 @@
         else if ( v > 246 )
           p += 1;
       }
+#ifdef CFF_CONFIG_OPTION_OLD_ENGINE
       else if ( v == 31 )
       {
         /* a Type 2 charstring */
@@ -1177,6 +1178,7 @@
           stack++;
         }
       }
+#endif /* CFF_CONFIG_OPTION_OLD_ENGINE */
       else
       {
         /* This is not a number, hence it's an operator.  Compute its code */