diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 3ac3e33c9..33f507764 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-04  Corinna Vinschen  <corinna@vinschen.de>
+
+	* hookapi.cc (rvadelta): Compute max_size using SizeOfRawData rather
+	than VirtualSize.
+
 2012-04-04  Corinna Vinschen  <corinna@vinschen.de>
 
 	* passwd.cc (_getpass_close_fd): New static pthread cleanup handler.
diff --git a/winsup/cygwin/hookapi.cc b/winsup/cygwin/hookapi.cc
index 11280c6a2..ba9d55112 100644
--- a/winsup/cygwin/hookapi.cc
+++ b/winsup/cygwin/hookapi.cc
@@ -57,7 +57,7 @@ rvadelta (PIMAGE_NT_HEADERS pnt, DWORD import_rva, DWORD &max_size)
 	&& (section[i].VirtualAddress + section[i].Misc.VirtualSize) > import_rva)
     // if (ascii_strncasematch ((char *) section[i].Name, ".idata", IMAGE_SIZEOF_SHORT_NAME))
       {
-	max_size = section[i].Misc.VirtualSize
+	max_size = section[i].SizeOfRawData
 		   - (import_rva - section[i].VirtualAddress);
 	return section[i].VirtualAddress - section[i].PointerToRawData;
       }