diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 9b04792a1e5..adc49cd2aad 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+1999-08-11  Bryce McKinlay  <bryce@albatross.co.nz>
+
+	* java/util/BitSet.java (set, clear, hashCode): specify "1" constant
+	as long.
+
 Mon Aug  9 18:33:38 1999  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
 
         * Makefile: Rebuilt.
diff --git a/libjava/java/util/BitSet.java b/libjava/java/util/BitSet.java
index e5886951714..cfbe8a6fe0c 100644
--- a/libjava/java/util/BitSet.java
+++ b/libjava/java/util/BitSet.java
@@ -56,7 +56,7 @@ public final class BitSet implements Cloneable, Serializable
       int bit = pos % 64;
       int offset = pos / 64;
       ensure (offset);
-      bits[offset] &= ~ (1 << bit);
+      bits[offset] &= ~ (1L << bit);
     }
 
   public Object clone ()
@@ -97,7 +97,7 @@ public final class BitSet implements Cloneable, Serializable
       if (offset >= bits.length)
 	return false;
 
-      return (bits[offset] & (1 << bit)) == 0 ? false : true;
+      return (bits[offset] & (1L << bit)) == 0 ? false : true;
     }
 
   public int hashCode ()
@@ -125,7 +125,7 @@ public final class BitSet implements Cloneable, Serializable
       int bit = pos % 64;
       int offset = pos / 64;
       ensure (offset);
-      bits[offset] |= 1 << bit;
+      bits[offset] |= 1L << bit;
     }
 
   public int size ()