diff --git a/ChangeLog b/ChangeLog
index 2185d925f..8dc1ce24e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-03-21  Werner Lemberg  <wl@gnu.org>
+
+	[truetype] Improve `gvar' handling.
+
+	* src/truetype/ttgxvar.c (ft_var_readpackedpoints): Correctly handle
+	single-element runs.  Cf. glyph `Q' in Skia.ttf with weights larger
+	than the default.
+
 2015-03-20  Alexei Podtelezhnikov <apodtele@gmail.com>
 
 	* src/base/fttrigon.c (FT_Vector_Rotate): Minor refactoring.
diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c
index 2652e75f5..77796f051 100644
--- a/src/truetype/ttgxvar.c
+++ b/src/truetype/ttgxvar.c
@@ -164,7 +164,7 @@
         first       = FT_GET_USHORT();
         points[i++] = first;
 
-        if ( runcnt < 1 || i + runcnt >= n )
+        if ( runcnt < 1 || i + runcnt > n )
           goto Exit;
 
         /* first point not included in run count */
@@ -179,7 +179,7 @@
         first       = FT_GET_BYTE();
         points[i++] = first;
 
-        if ( runcnt < 1 || i + runcnt >= n )
+        if ( runcnt < 1 || i + runcnt > n )
           goto Exit;
 
         for ( j = 0; j < runcnt; j++ )