diff --git a/ChangeLog b/ChangeLog
index a6198ebf5..864014a72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-19  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
+	* src/base/ftrfork.c (FT_Raccess_Guess): Switch to FT_Int counters.
+
 2012-12-19  Alexei Podtelezhnikov  <apodtele@gmail.com>
 
 	[base] Clean up trigonometric core.
diff --git a/src/base/ftrfork.c b/src/base/ftrfork.c
index 01d8625e6..dcefdd28d 100644
--- a/src/base/ftrfork.c
+++ b/src/base/ftrfork.c
@@ -362,7 +362,7 @@
                     FT_Long    *offsets,
                     FT_Error   *errors )
   {
-    FT_Long  i;
+    FT_Int  i;
 
 
     for ( i = 0; i < FT_RACCESS_N_RULES; i++ )
@@ -827,7 +827,7 @@
                     FT_Long    *offsets,
                     FT_Error   *errors )
   {
-    int  i;
+    FT_Int  i;
 
     FT_UNUSED( library );
     FT_UNUSED( stream );