diff --git a/classpath/java/util/Collections.java b/classpath/java/util/Collections.java
index 134c481322..d2391d7435 100644
--- a/classpath/java/util/Collections.java
+++ b/classpath/java/util/Collections.java
@@ -143,10 +143,10 @@ public class Collections {
     public void clear() {
       synchronized (lock) { map.clear(); }
     }
-    public boolean containsKey(K key) {
+    public boolean containsKey(Object key) {
       synchronized (lock) { return map.containsKey(key); }
     }
-    public boolean containsValue(V value) {
+    public boolean containsValue(Object value) {
       synchronized (lock) { return map.containsValue(value); }
     }
     public Set<java.util.Map.Entry<K, V>> entrySet() {
diff --git a/classpath/java/util/Hashtable.java b/classpath/java/util/Hashtable.java
index 8ae75941a3..b08b4c3b67 100644
--- a/classpath/java/util/Hashtable.java
+++ b/classpath/java/util/Hashtable.java
@@ -40,11 +40,11 @@ public class Hashtable<K, V> implements Map<K, V> {
     return map.size();
   }
 
-  public synchronized boolean containsKey(K key) {
+  public synchronized boolean containsKey(Object key) {
     return map.containsKey(key);
   }
 
-  public synchronized boolean containsValue(V value) {
+  public synchronized boolean containsValue(Object value) {
     return map.containsValue(value);
   }
 
diff --git a/classpath/java/util/IdentityHashMap.java b/classpath/java/util/IdentityHashMap.java
index 7a86c5a192..123c26990e 100644
--- a/classpath/java/util/IdentityHashMap.java
+++ b/classpath/java/util/IdentityHashMap.java
@@ -29,11 +29,11 @@ public class IdentityHashMap<K, V> implements Map<K, V> {
     return map.size();
   }
 
-  public boolean containsKey(K key) {
+  public boolean containsKey(Object key) {
     return map.containsKey(key);
   }
 
-  public boolean containsValue(V value) {
+  public boolean containsValue(Object value) {
     return map.containsValue(value);
   }
 
diff --git a/classpath/java/util/Map.java b/classpath/java/util/Map.java
index 47edee351e..79867bd267 100644
--- a/classpath/java/util/Map.java
+++ b/classpath/java/util/Map.java
@@ -15,9 +15,15 @@ public interface Map<K, V> {
 
   public int size();
 
+<<<<<<< HEAD:classpath/java/util/Map.java
   public boolean containsKey(Object obj);
 
   public boolean containsValue(Object obj);
+=======
+  public boolean containsKey(Object key);
+
+  public boolean containsValue(Object value);
+>>>>>>> af784f4cbc18911e29127bcda8110de9bb56d654:classpath/java/util/Map.java
 
   public V get(Object key);
 
diff --git a/classpath/java/util/WeakHashMap.java b/classpath/java/util/WeakHashMap.java
index 1618d58907..8a8da9c1c0 100644
--- a/classpath/java/util/WeakHashMap.java
+++ b/classpath/java/util/WeakHashMap.java
@@ -44,12 +44,12 @@ public class WeakHashMap<K, V> implements Map<K, V> {
     return map.size();
   }
 
-  public boolean containsKey(K key) {
+  public boolean containsKey(Object key) {
     poll();
     return map.containsKey(key);
   }
 
-  public boolean containsValue(V value) {
+  public boolean containsValue(Object  value) {
     poll();
     return map.containsValue(value);
   }
diff --git a/makefile b/makefile
index 1159306512..98694b3d1c 100644
--- a/makefile
+++ b/makefile
@@ -334,6 +334,13 @@ test: build
 		$(executable) $(mode) "$(flags)" \
 		$(call class-names,$(test-build),$(test-classes))
 
+.PHONY: tarball
+tarball:
+	@echo "creating build/avian-$(version).tar.bz2"
+	@mkdir -p build
+	(cd .. && tar --exclude=build --exclude='.*' --exclude='*~' -cjf \
+		avian/build/avian-$(version).tar.bz2 avian)
+
 .PHONY: javadoc
 javadoc:
 	javadoc -sourcepath classpath -d build/javadoc -subpackages java \