diff --git a/ChangeLog b/ChangeLog
index 47fc4e42e..fe75bb546 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,8 +46,7 @@
 
 	Enable access to the various dropout rules of the B&W rasterizer.
 	Pass dropout rules from the TT bytecode interpreter to the
-	rasterizer; temporarily this is enabled only if
-	`USE_SCAN_CONVERSION_RULES' is defined.
+	rasterizer.
 
 	* include/freetype/ftimage.h (FT_OUTLINE_SMART_DROPOUTS,
 	FT_OUTLINE_EXCLUDE_STUBS): New flags for for FT_Outline.
@@ -58,9 +57,8 @@
 	Fix mode 4 computation.
 	(Render_Glyph, Render_Gray_Glyph): Handle new outline flags.
 
-	* src/truetype/ttgload.c (TT_Load_Glyph)
-	[USE_SCAN_CONVERSION_RULES]: Convert scan conversion mode to
-	FT_OUTLINE_XXX flags.
+	* src/truetype/ttgload.c (TT_Load_Glyph) Convert scan conversion
+	mode to FT_OUTLINE_XXX flags.
 
 	* src/truetype/ttinterp.c (Ins_SCANCTRL): Enable ppem check.
 
diff --git a/docs/CHANGES b/docs/CHANGES
index e74bcc893..ef4176d1a 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -24,7 +24,7 @@ CHANGES BETWEEN 2.3.7 and 2.3.6
 
     - Two      new      macros,      FT_OUTLINE_SMART_DROPOUTS     and
       FT_OUTLINE_EXCLUDE_STUBS,  have been introduced.   Together with
-      FT_OUTLINE_IGNORE_DROPOUTS (which  was ignored until now)  it is
+      FT_OUTLINE_IGNORE_DROPOUTS (which  was ignored previously) it is
       now possible to control the dropout mode  of the `raster' module
       (for B&W rasterization),   using  the   `flags'  field   in  the
       `FT_Outline' structure.