diff --git a/ChangeLog b/ChangeLog
index eb6e161e6..79b4df16f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-05-11  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Fix variable initializations.
+
+	* src/autofit/afhints.c (af_glyph_hints_reload): Assign default
+	values to `in_dir' and `out_dir' for all points.
+
 2014-05-11  Werner Lemberg  <wl@gnu.org>
 
 	[autofit] Fix crash with font `CabinSketch-Bold.ttf'.
diff --git a/src/autofit/afhints.c b/src/autofit/afhints.c
index 75a345275..88a97d45e 100644
--- a/src/autofit/afhints.c
+++ b/src/autofit/afhints.c
@@ -651,6 +651,9 @@
 
         for ( point = points; point < point_limit; point++, vec++, tag++ )
         {
+          point->in_dir  = (FT_Char)AF_DIR_NONE;
+          point->out_dir = (FT_Char)AF_DIR_NONE;
+
           point->fx = (FT_Short)vec->x;
           point->fy = (FT_Short)vec->y;
           point->ox = point->x = FT_MulFix( vec->x, x_scale ) + x_delta;