diff --git a/ChangeLog b/ChangeLog
index e67ff28a6..ff9472933 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2015-05-24  Werner Lemberg  <wl@gnu.org>
+
+	[truetype] Fix commit from 2015-05-22.
+
+	* src/truetype/ttgload.c, src/truetype/ttinterp.c: Guard new code
+	with `TT_CONFIG_OPTION_SUBPIXEL_HINTING'.
+
+	Problem reported by Nikolaus Waxweiler <madigens@gmail.com>.
+
 2015-05-23  Werner Lemberg  <wl@gnu.org>
 
 	[truetype] Fix return values of GETINFO bytecode instruction.
diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c
index 55d3c9913..d1edd7e2c 100644
--- a/src/truetype/ttgload.c
+++ b/src/truetype/ttgload.c
@@ -2299,10 +2299,12 @@
       if ( exec->GS.instruct_control & 2 )
         exec->GS = tt_default_graphics_state;
 
+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
       /* check whether we have a font hinted for ClearType --           */
       /* note that this flag can also be modified in a glyph's bytecode */
       if ( exec->GS.instruct_control & 4 )
         exec->ignore_x_mode = 0;
+#endif
 
       exec->pedantic_hinting = FT_BOOL( load_flags & FT_LOAD_PEDANTIC );
       loader->exec = exec;
diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c
index 67f0cc834..0f9fb0caf 100644
--- a/src/truetype/ttinterp.c
+++ b/src/truetype/ttinterp.c
@@ -5185,10 +5185,12 @@
     exc->GS.instruct_control &= ~(FT_Byte)Kf;
     exc->GS.instruct_control |= (FT_Byte)L;
 
+#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
     /* INSTCTRL modifying flag 3 also has an effect */
     /* outside of the CVT program                   */
     if ( K == 3 )
       exc->ignore_x_mode = FT_BOOL( L == 4 );
+#endif
   }