diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 5cd39d24449..d6d58bd4414 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2000-01-04  Warren Levy  <warrenl@cygnus.com>
+
+	* java/net/natPlainDatagramSocketImpl.cc (peek): Removed unnecesary
+	comment.
+	(receive): Set the sender's address in the DatagramPacket.
+
 2000-01-04  Tom Tromey  <tromey@cygnus.com>
 
 	* java/lang/reflect/natConstructor.cc (newInstance): Pass
diff --git a/libjava/java/net/natPlainDatagramSocketImpl.cc b/libjava/java/net/natPlainDatagramSocketImpl.cc
index c48b1bcf0e6..93f017774a2 100644
--- a/libjava/java/net/natPlainDatagramSocketImpl.cc
+++ b/libjava/java/net/natPlainDatagramSocketImpl.cc
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999  Cygnus Solutions
+/* Copyright (C) 1999, 2000  Cygnus Solutions
 
    This file is part of libgcj.
 
@@ -242,7 +242,6 @@ java::net::PlainDatagramSocketImpl::peek (java::net::InetAddress *i)
 #endif
   else
     goto error;
-  // FIXME: Multicast:  s->address = new InetAddress (raddr, NULL);
   i->address = raddr;
   return rport;
  error:
@@ -335,7 +334,7 @@ java::net::PlainDatagramSocketImpl::receive (java::net::DatagramPacket *p)
 #endif
   else
     goto error;
-  // FIXME: Multicast:  s->address = new InetAddress (raddr, NULL);
+  p->setAddress (new InetAddress (raddr, NULL));
   p->setPort (rport);
   p->setLength ((jint) retlen);
   return;