diff --git a/ChangeLog b/ChangeLog
index 2fb9dd4b7..8f51e0163 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2016-09-08  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Another improvement to Armenian support.
+
+	Suggested by Hrant H Papazian <hpapazian@gmail.com>.
+
+	* src/autofit/afscript.h: Use better suited characters to derive
+	default stem widths.
+
 2016-09-07  Alexei Podtelezhnikov  <apodtele@gmail.com>
 
 	* src/smooth/ftgrays.c (gray_hline): Microptimize.
diff --git a/src/autofit/afscript.h b/src/autofit/afscript.h
index 33c301298..cffe59105 100644
--- a/src/autofit/afscript.h
+++ b/src/autofit/afscript.h
@@ -40,7 +40,7 @@
           "Armenian",
           HB_SCRIPT_ARMENIAN,
           HINTING_BOTTOM_TO_TOP,
-          "\xD6\x85 \xD5\x95" ) /* օ Օ */
+          "\xD5\xBD \xD5\x8D" ) /* ս Ս */
 
   /* there are no simple forms for letters; we thus use two digit shapes */
   SCRIPT( beng, BENG,