diff --git a/ChangeLog b/ChangeLog
index bcdc5bf09..f17623f81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2006-08-22  Jens Claudius  <jens.claudius@yahoo.com>
+	Fix for previous commit, which caused many compiler warnings/errors
+	about addresses of volatile objects passed as function arguments
+	as non-volatile pointers.
+
+
+	* freetype2/include/freetype/internal/ftvalid.h: Make
+	FT_Validator typedef a pointer to a volatile object.
+
+	* freetype2/src/gxvalid/gxvmod.c (gxv_load_table): Make function
+	argument `table' a pointer to a volatile object.
+
+	* freetype2/src/otvalid/otvmod.c (otv_load_table): Make function
+	argument `table' a pointer to a volatile object.
+
 2006-08-18  Jens Claudius  <jens.claudius@yahoo.com>
 
 	* freetype2/src/gxvalid/gxvmod.c (GXV_TABLE_DECL): Mark local
diff --git a/include/freetype/internal/ftvalid.h b/include/freetype/internal/ftvalid.h
index d52ff2f3b..12bbc2b41 100644
--- a/include/freetype/internal/ftvalid.h
+++ b/include/freetype/internal/ftvalid.h
@@ -39,7 +39,7 @@ FT_BEGIN_HEADER
   /*************************************************************************/
 
   /* handle to a validation object */
-  typedef struct FT_ValidatorRec_*  FT_Validator;
+  typedef struct FT_ValidatorRec_ volatile*  FT_Validator;
 
 
   /*************************************************************************/
diff --git a/src/gxvalid/gxvmod.c b/src/gxvalid/gxvmod.c
index d8d6e2a06..d471c2ac0 100644
--- a/src/gxvalid/gxvmod.c
+++ b/src/gxvalid/gxvmod.c
@@ -48,10 +48,10 @@
 
 
   static FT_Error
-  gxv_load_table( FT_Face    face,
-                  FT_Tag     tag,
-                  FT_Byte**  table,
-                  FT_ULong*  table_len )
+  gxv_load_table( FT_Face             face,
+                  FT_Tag              tag,
+                  FT_Byte* volatile*  table,
+                  FT_ULong*           table_len )
   {
     FT_Error   error;
     FT_Memory  memory = FT_FACE_MEMORY( face );
diff --git a/src/otvalid/otvmod.c b/src/otvalid/otvmod.c
index cc4ed89d1..9014d8fe8 100644
--- a/src/otvalid/otvmod.c
+++ b/src/otvalid/otvmod.c
@@ -39,10 +39,10 @@
 
 
   static FT_Error
-  otv_load_table( FT_Face    face,
-                  FT_Tag     tag,
-                  FT_Byte*  *table,
-                  FT_ULong  *table_len )
+  otv_load_table( FT_Face            face,
+                  FT_Tag             tag,
+                  FT_Byte* volatile* table,
+                  FT_ULong*          table_len )
   {
     FT_Error   error;
     FT_Memory  memory = FT_FACE_MEMORY( face );