diff --git a/ChangeLog b/ChangeLog
index d64f42610..cd3305442 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-09  Werner Lemberg  <wl@gnu.org>
+
+	* include/freetype/internal/ftcalc.h: Move declaration of
+	FT_SqrtFixed() out of `#ifdef FT_LONG64'.
+
 2001-05-08  Francesco Zappa Nardelli  <Francesco.Zappa.Nardelli@ens.fr>
 
 	* src/pcfdriver.c (PCF_Load_Glyph): Fixed incorrect bitmap width
@@ -10,8 +15,9 @@
 	line numbers reported during errors and warnings, and other
 	formatting issues.
 
-	* src/base/ftcalc.c: Carious tiny fixes related to rounding in
-	64-bits routines and pseudo"optimizations" :-)
+	* src/base/ftcalc.c (FT_MulDiv, FT_MulFix, FT_DivFix): Various tiny
+	fixes related to rounding in 64-bits routines and
+	pseudo-"optimizations".
 
 2001-04-27  David Turner  <david@freetype.org>
 
diff --git a/include/freetype/internal/ftcalc.h b/include/freetype/internal/ftcalc.h
index cc4f5af4f..477083fbb 100644
--- a/include/freetype/internal/ftcalc.h
+++ b/include/freetype/internal/ftcalc.h
@@ -146,8 +146,6 @@ FT_BEGIN_HEADER
                                        FT_Int32   y );
 
 
-  FT_EXPORT( FT_Int32 )  FT_SqrtFixed( FT_Int32  x );
-
 #ifdef FT_CONFIG_OPTION_OLD_CALCS
 
 #define SQRT_64( z )  FT_Sqrt64( &z )
@@ -176,6 +174,9 @@ FT_BEGIN_HEADER
 #endif /* FT_LONG64 */
 
 
+  FT_EXPORT( FT_Int32 )  FT_SqrtFixed( FT_Int32  x );
+
+
 #ifndef FT_CONFIG_OPTION_OLD_CALCS
 
 #define SQRT_32( x )  FT_Sqrt32( x )