diff --git a/fc-lang/fc-lang.py b/fc-lang/fc-lang.py
index cc1dea8..8facea6 100755
--- a/fc-lang/fc-lang.py
+++ b/fc-lang/fc-lang.py
@@ -251,7 +251,7 @@ if __name__=='__main__':
     print('#define fcLangCharSetIndices (fcLangData.langIndices)')
     print('#define fcLangCharSetIndicesInv (fcLangData.langIndicesInv)')
 
-    assert len(sets) < 256 # FIXME: need to change index type to 16-bit below then
+    assert len(sets) < 65536 # FIXME: need to change index type to 32-bit below then
 
     print('''
 static const struct {{
@@ -262,7 +262,7 @@ static const struct {{
     {}       langIndices[{}];
     {}       langIndicesInv[{}];
 }} fcLangData = {{'''.format(len(sets), len(leaves), tn, tn,
-                             'FcChar8 ', len(sets), 'FcChar8 ', len(sets)))
+                             'FcChar16 ', len(sets), 'FcChar16 ', len(sets)))
 
     # Dump sets
     print('{')
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index ac5a0b0..15c1b95 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -67,7 +67,7 @@ typedef int		FcBool;
  * it means multiple copies of the font information.
  */
 
-#define FC_CACHE_VERSION_NUMBER	8
+#define FC_CACHE_VERSION_NUMBER	9
 #define _FC_STRINGIFY_(s)    	#s
 #define _FC_STRINGIFY(s)    	_FC_STRINGIFY_(s)
 #define FC_CACHE_VERSION    	_FC_STRINGIFY(FC_CACHE_VERSION_NUMBER)