diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index ab42b75c8..fec358096 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul 27 10:24:36 2000  Egor Duda <deo@logos-m.ru>
+
+	* fhandler.cc (fhandler_disk_file::fstat): Allow block calculation to
+	succeed for files >= 2GB and <= 4GB.
+
 Wed Jul 26 16:05:04 2000  Christopher Faylor <cgf@cygnus.com>
 
 	* exceptions.cc (signal_exit): Renamed from "really_exit".  Always sets
diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc
index 35da0d8fd..fc1451c68 100644
--- a/winsup/cygwin/fhandler.cc
+++ b/winsup/cygwin/fhandler.cc
@@ -946,7 +946,7 @@ fhandler_disk_file::fstat (struct stat *buf)
     }
 
   buf->st_blksize = S_BLKSIZE;
-  buf->st_blocks  = (buf->st_size + S_BLKSIZE-1) / S_BLKSIZE;
+  buf->st_blocks  = ((unsigned long) buf->st_size + S_BLKSIZE-1) / S_BLKSIZE;
 
   /* Using a side effect: get_file_attibutes checks for
      directory. This is used, to set S_ISVTX, if needed.  */