diff --git a/ChangeLog b/ChangeLog
index 096165057..54607b0de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-06-17  Werner Lemberg  <wl@gnu.org>
+
+	Partially revert commit from 2014-06-13.
+
+	* src/autofit/aflatin.c (af_latin_metrics_init_blues): Move
+	declaration of `p_first' and `p_last' out of the loop.
+
 2014-06-17  Werner Lemberg  <wl@gnu.org>
 
 	* builds/unix/freetype2.m4: s/AC_PATH_PROG/AC_PATH_TOOL/.
diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c
index 17f8844c5..a1f2b337b 100644
--- a/src/autofit/aflatin.c
+++ b/src/autofit/aflatin.c
@@ -536,6 +536,13 @@
               FT_Int   last;
               FT_Bool  hit;
 
+              /* we intentionally declare these two variables        */
+              /* outside of the loop since various compilers emit    */
+              /* incorrect warning messages otherwise, talking about */
+              /* `possibly uninitialized variables'                  */
+              FT_Int  p_first = 0;            /* make compiler happy */
+              FT_Int  p_last  = 0;
+
               FT_Bool  left2right;
 
 
@@ -568,8 +575,6 @@
               {
                 FT_Bool  l2r;
                 FT_Pos   d;
-                FT_Int   p_first = 0; /* make compiler happy */
-                FT_Int   p_last  = 0;
 
 
                 if ( !hit )