diff --git a/ChangeLog b/ChangeLog
index e5142c9be..44c2181de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2016-06-07  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Fix compilation with VS2016 (#48126).
+
+	This compiler doesn't recognize the end-of-comment sequence `*/' if
+	it immediately follows non-ASCII characters.
+
+	* src/autofit/afscript.h: Ensure whitespace before `*/'.
+
 2016-06-04  Werner Lemberg  <wl@gnu.org>
 
 	Fix a test for named instances (#48122).
diff --git a/src/autofit/afscript.h b/src/autofit/afscript.h
index 7479ac58f..660eca796 100644
--- a/src/autofit/afscript.h
+++ b/src/autofit/afscript.h
@@ -47,7 +47,7 @@
           "Bengali",
           HB_SCRIPT_BENGALI,
           HINTING_TOP_TO_BOTTOM,
-          "\xE0\xA7\xA6 \xE0\xA7\xAA" ) /* ০ ৪*/
+          "\xE0\xA7\xA6 \xE0\xA7\xAA" ) /* ০ ৪ */
 
   SCRIPT( cyrl, CYRL,
           "Cyrillic",
@@ -89,7 +89,7 @@
           "Gurmukhi",
           HB_SCRIPT_GURMUKHI,
           HINTING_TOP_TO_BOTTOM,
-          "\xE0\xA8\xA0 \xE0\xA8\xB0 \xE0\xA9\xA6" ) /* ਠ ਰ ੦*/
+          "\xE0\xA8\xA0 \xE0\xA8\xB0 \xE0\xA9\xA6" ) /* ਠ ਰ ੦ */
 
   SCRIPT( hebr, HEBR,
           "Hebrew",