diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 14f9d65f048..9519e05fa15 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-05  Warren Levy  <warrenl@cygnus.com>
+
+	* java/net/DatagramSocket.java(DatagramSocket(int,InetAddress)):
+	  Handle null addresses.
+
 2000-03-04  Anthony Green  <green@redhat.com>
 
 	* configure.host (libgcj_flags): Define __NO_MATH_INLINES.
diff --git a/libjava/java/net/DatagramSocket.java b/libjava/java/net/DatagramSocket.java
index 33d666b7b6d..688cd6695e6 100644
--- a/libjava/java/net/DatagramSocket.java
+++ b/libjava/java/net/DatagramSocket.java
@@ -1,6 +1,6 @@
 // DatagramSocket.java
 
-/* Copyright (C) 1999  Red Hat, Inc.
+/* Copyright (C) 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -66,7 +66,7 @@ public class DatagramSocket
     if (this instanceof MulticastSocket)
       impl.setOption(SocketOptions.SO_REUSEADDR, new Boolean(true));
 
-    impl.bind(port, laddr);
+    impl.bind(port, laddr == null ? ServerSocket.ANY_IF : laddr);
   }
 
   public void close()