diff --git a/ChangeLog b/ChangeLog
index d2602d8bb..4077856d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2017-03-12  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
+	[smooth] Dubious fix for Firefox.
+
+	* src/base/ftlcdfil.c (FT_Library_SetLcdFilter{,Weights})
+	[!FT_CONFIG_OPTION_SUBPIXEL_RENDERING]: Return FT_Err_Ok instead of
+	FT_Err_Unimplemented_Feature.
+	* include/freetype/ftlcdfil.h: Documentation updated.
+
 2017-03-08  Alexei Podtelezhnikov  <apodtele@gmail.com>
 
 	[smooth] Harmony itself.
diff --git a/include/freetype/ftlcdfil.h b/include/freetype/ftlcdfil.h
index 6811f5c8f..795c045f2 100644
--- a/include/freetype/ftlcdfil.h
+++ b/include/freetype/ftlcdfil.h
@@ -229,10 +229,9 @@ FT_BEGIN_HEADER
    *   @FT_LCD_FILTER_NONE in order to enable it.
    *
    *   Due to *PATENTS* covering subpixel rendering, this function doesn't
-   *   do anything except returning `FT_Err_Unimplemented_Feature' if the
-   *   configuration macro FT_CONFIG_OPTION_SUBPIXEL_RENDERING is not
-   *   defined in your build of the library, which should correspond to all
-   *   default builds of FreeType.
+   *   do anything if FT_CONFIG_OPTION_SUBPIXEL_RENDERING is not defined
+   *   in your build of the library, which should correspond to all default
+   *   builds of FreeType.
    *
    * @since:
    *   2.3.0
@@ -264,10 +263,9 @@ FT_BEGIN_HEADER
    *
    * @note:
    *   Due to *PATENTS* covering subpixel rendering, this function doesn't
-   *   do anything except returning `FT_Err_Unimplemented_Feature' if the
-   *   configuration macro FT_CONFIG_OPTION_SUBPIXEL_RENDERING is not
-   *   defined in your build of the library, which should correspond to all
-   *   default builds of FreeType.
+   *   do anything if FT_CONFIG_OPTION_SUBPIXEL_RENDERING is not defined
+   *   in your build of the library, which should correspond to all default
+   *   builds of FreeType.
    *
    *   LCD filter weights can also be set per face using @FT_Face_Properties
    *   with @FT_PARAM_TAG_LCD_FILTER_WEIGHTS.
diff --git a/src/base/ftlcdfil.c b/src/base/ftlcdfil.c
index 611b39f57..515d8adab 100644
--- a/src/base/ftlcdfil.c
+++ b/src/base/ftlcdfil.c
@@ -377,7 +377,7 @@
     FT_UNUSED( library );
     FT_UNUSED( weights );
 
-    return FT_THROW( Unimplemented_Feature );
+    return FT_Err_Ok;
   }
 
 
@@ -388,7 +388,7 @@
     FT_UNUSED( library );
     FT_UNUSED( filter );
 
-    return FT_THROW( Unimplemented_Feature );
+    return FT_Err_Ok;
   }
 
 #endif /* !FT_CONFIG_OPTION_SUBPIXEL_RENDERING */