diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 5ad23895a702..2a439c1fd2e6 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-15  Michael Koch  <konqueror@gmx.de>
+
+	* java/util/zip/InflaterInputStream.java
+	(InflaterInputStream): Renamed infl to inf and bufsize to size,
+	added description to exception, check for inf == null and size < 0.
+
 2003-10-15  Michael Koch  <konqueror@gmx.de>
 
 	* java/text/AttributedCharacterIterator.java,
diff --git a/libjava/java/util/zip/InflaterInputStream.java b/libjava/java/util/zip/InflaterInputStream.java
index 8ee88e5f11c5..597ed6bee5b2 100644
--- a/libjava/java/util/zip/InflaterInputStream.java
+++ b/libjava/java/util/zip/InflaterInputStream.java
@@ -70,15 +70,21 @@ public class InflaterInputStream extends FilterInputStream
     this (in, infl, 512);
   }
 
-  public InflaterInputStream (InputStream in, Inflater infl, int bufsize)
+  public InflaterInputStream (InputStream in, Inflater inf, int size)
   {
     super (in);
 
     if (in == null)
-      throw new NullPointerException();
+      throw new NullPointerException ("in may not be null");
+
+    if (inf == null)
+      throw new NullPointerException ("inf may not be null");
     
-    this.inf = infl;
-    this.buf = new byte[bufsize];
+    if (size < 0)
+      throw new IllegalArgumentException ("size may not be negative");
+    
+    this.inf = inf;
+    this.buf = new byte [size];
   }
 
   public int read () throws IOException