diff --git a/ChangeLog b/ChangeLog
index 3b525ca49..b9d858280 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2020-01-04  Werner Lemberg  <wl@gnu.org>
+
+	[base] Fix `FREETYPE_PROPERTIES=type1:hinting-engine=adobe`.
+
+	* src/base/ftpsprop.c (ps_property_set) [hinting-engine]: Avoid an
+	incorrect return value that caused a warning.  The function did the
+	right thing, though.
+
 2020-01-03  Werner Lemberg  <wl@gnu.org>
 
 	[woff2] Fix memory leaks and a runtime warning.
diff --git a/src/base/ftpsprop.c b/src/base/ftpsprop.c
index 52b9d453a..3a31a18b1 100644
--- a/src/base/ftpsprop.c
+++ b/src/base/ftpsprop.c
@@ -165,9 +165,9 @@
           driver->hinting_engine = *hinting_engine;
         else
           error = FT_ERR( Unimplemented_Feature );
-
-        return error;
       }
+
+      return error;
     }
 
     else if ( !ft_strcmp( property_name, "no-stem-darkening" ) )