diff --git a/ChangeLog b/ChangeLog
index c0dc27a13..48e6199aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-04-17  Werner Lemberg  <wl@gnu.org>
+
+	Make `FT_Get_SubGlyph_Info' actually work.
+
+	* src/base/ftobjs.c (FT_Get_SubGlyph_Info): Return FT_Err_Ok
+	if there is no error.
+
 2014-04-15  Werner Lemberg  <wl@gnu.org>
 
 	[afblue.pl]: Minor improvements.
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 6f323362a..cc561054a 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -4881,6 +4881,8 @@
       *p_arg1      = subg->arg1;
       *p_arg2      = subg->arg2;
       *p_transform = subg->transform;
+
+      error = FT_Err_Ok;
     }
 
     return error;