diff --git a/ChangeLog b/ChangeLog
index cdeb6b604..d6ba1c897 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-09-09  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Improve communication with ftgrid.
+
+	* src/autofit/afhints.c (af_glyph_hints_get_segment_offset):
+	Provide values in font units.
+
 2017-09-08  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
 
 	[base] Remove a check for resource ID in the resource fork driver.
diff --git a/src/autofit/afhints.c b/src/autofit/afhints.c
index f1ff0baef..1b21c06c2 100644
--- a/src/autofit/afhints.c
+++ b/src/autofit/afhints.c
@@ -507,15 +507,15 @@
       return FT_THROW( Invalid_Argument );
 
     seg      = &axis->segments[idx];
-    *offset  = ( dim == AF_DIMENSION_HORZ ) ? seg->first->ox
-                                            : seg->first->oy;
+    *offset  = ( dim == AF_DIMENSION_HORZ ) ? seg->first->fx
+                                            : seg->first->fy;
     if ( seg->edge )
       *is_blue = (FT_Bool)( seg->edge->blue_edge != 0 );
     else
       *is_blue = FALSE;
 
     if ( *is_blue )
-      *blue_offset = seg->edge->blue_edge->cur;
+      *blue_offset = seg->edge->blue_edge->org;
     else
       *blue_offset = 0;