diff --git a/ANNOUNCE b/ANNOUNCE
index 84468a0a5..00c964e98 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -311,7 +311,8 @@ version 1.5.0beta36 [July 29, 2010]
     negative numbers.
 
 version 1.5.0beta37 [July 30, 2010]
-  Added a typecast in png_get_int_32() to avoid compiler warning.
+  Added a typecast in png_get_int_32() in png.h and pngrutil.h to avoid
+    a compiler warning.
   Replaced oFFs 0,0 with oFFs -10,20 in pngtest.png
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
diff --git a/CHANGES b/CHANGES
index b44d8b641..e1fd40cb1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2793,7 +2793,8 @@ version 1.5.0beta36 [July 29, 2010]
     negative numbers.
 
 version 1.5.0beta37 [July 30, 2010]
-  Added a typecast in png_get_int_32() to avoid compiler warning.
+  Added a typecast in png_get_int_32() in png.h and pngrutil.h to avoid
+    a compiler warning.
   Replaced oFFs 0,0 with oFFs -10,20 in pngtest.png
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
diff --git a/png.h b/png.h
index b7960ac3c..a99a34773 100644
--- a/png.h
+++ b/png.h
@@ -2023,8 +2023,8 @@ PNG_EXPORT(png_bytep,png_get_io_chunk_name,(png_structp png_ptr),,200);
       ((png_uint_32)(*((buf) + 1))))
 #  define png_get_int_32(buf) \
      ((png_int_32)((*(buf) & 0x80) \
-      ? -((png_get_uint_32(buf) ^ 0xffffffff)+1) \
-      : png_get_uint_32(buf)))
+      ? -((png_int_32)((png_get_uint_32(buf) ^ 0xffffffff)+1)) \
+      : (png_int_32)png_get_uint_32(buf)))
 #endif
 
 #ifdef PNG_READ_INT_FUNCTIONS_SUPPORTED