diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index fb2e46a48cf..7ff9c1c26fc 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2000-02-19  Bryce McKinlay  <bryce@albatross.co.nz>
+
+	* java/util/zip/ZipEntry.java (setCrc): Fix overflow.
+	(setSize): ditto.
+
 2000-02-18  Tom Tromey  <tromey@cygnus.com>
 
 	* include/jvm.h (_Jv_GetJavaVM): Declare.
diff --git a/libjava/java/util/zip/ZipEntry.java b/libjava/java/util/zip/ZipEntry.java
index b2a010f4a43..6e22885e276 100644
--- a/libjava/java/util/zip/ZipEntry.java
+++ b/libjava/java/util/zip/ZipEntry.java
@@ -94,7 +94,7 @@ public class ZipEntry implements ZipConstants
 
   public void setCrc (long crc) 
   {
-    if (crc < 0 || crc > 0xffffffff)
+    if (crc < 0 || crc > 0xffffffffL)
       throw new IllegalArgumentException ();
     this.crc = crc;
   }
@@ -115,7 +115,7 @@ public class ZipEntry implements ZipConstants
 
   public void setSize (long size)
   {
-    if (size < 0 || size > 0xffffffff)
+    if (size < 0 || size > 0xffffffffL)
       throw new IllegalArgumentException ();
     this.size = size;
   }