diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index dce810fa3ab..ca939837674 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,14 @@
+2007-04-02  Tom Tromey  <tromey@redhat.com>
+
+	https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=233406
+	* gnu/java/net/natPlainSocketImplPosix.cc (create): Return if
+	already created.
+	* gnu/java/net/PlainSocketImpl.java (getLocalAddress): Handle case
+	where localport is -1.
+	(create): Now public.
+	* gnu/java/nio/SocketChannelImpl.java (SocketChannelImpl): Call
+	'create' on the socket.
+
 2007-04-02  Andrew Haley  <aph@redhat.com>
 
 	* java/lang/reflect/natVMProxy.cc (run_proxy): Use
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/event/ThreadStartEvent.class b/libjava/classpath/lib/gnu/classpath/jdwp/event/ThreadStartEvent.class
index 05fd3dcb570..84f88dd75ac 100644
Binary files a/libjava/classpath/lib/gnu/classpath/jdwp/event/ThreadStartEvent.class and b/libjava/classpath/lib/gnu/classpath/jdwp/event/ThreadStartEvent.class differ
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/transport/SocketTransport.class b/libjava/classpath/lib/gnu/classpath/jdwp/transport/SocketTransport.class
index 8d7f0932b02..eb7fc332aa6 100644
Binary files a/libjava/classpath/lib/gnu/classpath/jdwp/transport/SocketTransport.class and b/libjava/classpath/lib/gnu/classpath/jdwp/transport/SocketTransport.class differ
diff --git a/libjava/classpath/lib/gnu/java/net/PlainSocketImpl$SocketInputStream.class b/libjava/classpath/lib/gnu/java/net/PlainSocketImpl$SocketInputStream.class
index 5c42da8e08a..28c8a6d5716 100644
Binary files a/libjava/classpath/lib/gnu/java/net/PlainSocketImpl$SocketInputStream.class and b/libjava/classpath/lib/gnu/java/net/PlainSocketImpl$SocketInputStream.class differ
diff --git a/libjava/classpath/lib/gnu/java/net/PlainSocketImpl$SocketOutputStream.class b/libjava/classpath/lib/gnu/java/net/PlainSocketImpl$SocketOutputStream.class
index 739340fd585..58cd4b956db 100644
Binary files a/libjava/classpath/lib/gnu/java/net/PlainSocketImpl$SocketOutputStream.class and b/libjava/classpath/lib/gnu/java/net/PlainSocketImpl$SocketOutputStream.class differ
diff --git a/libjava/classpath/lib/gnu/java/net/PlainSocketImpl.class b/libjava/classpath/lib/gnu/java/net/PlainSocketImpl.class
index 1e26dd573b3..1eaf6587bcf 100644
Binary files a/libjava/classpath/lib/gnu/java/net/PlainSocketImpl.class and b/libjava/classpath/lib/gnu/java/net/PlainSocketImpl.class differ
diff --git a/libjava/classpath/lib/gnu/java/nio/SocketChannelImpl.class b/libjava/classpath/lib/gnu/java/nio/SocketChannelImpl.class
index 26c94fce092..88548eb01af 100644
Binary files a/libjava/classpath/lib/gnu/java/nio/SocketChannelImpl.class and b/libjava/classpath/lib/gnu/java/nio/SocketChannelImpl.class differ
diff --git a/libjava/gnu/java/net/PlainSocketImpl.java b/libjava/gnu/java/net/PlainSocketImpl.java
index dad1724d6b1..d2c8f02b67d 100644
--- a/libjava/gnu/java/net/PlainSocketImpl.java
+++ b/libjava/gnu/java/net/PlainSocketImpl.java
@@ -228,7 +228,9 @@ public final class PlainSocketImpl extends SocketImpl
    *
    * @param stream true for a stream socket, false for a datagram socket
    */
-  protected native void create(boolean stream) throws IOException;
+  // FIXME: this is public for nio ... but this is just a hack
+  // until we upgrade to Classpath's nio.
+  public native void create(boolean stream) throws IOException;
 
   /**
    * Connects to the remote hostname and port specified as arguments.
@@ -336,7 +338,7 @@ public final class PlainSocketImpl extends SocketImpl
 	  {
 	    localSocketAddress
 	      = new InetSocketAddress ((InetAddress) getOption(SocketOptions.SO_BINDADDR),
-				       localport);
+				       localport == -1 ? 0 : localport);
 	  }
 	catch (SocketException _)
 	  {
diff --git a/libjava/gnu/java/net/natPlainSocketImplPosix.cc b/libjava/gnu/java/net/natPlainSocketImplPosix.cc
index d16f1d31f7b..b4f4a851e81 100644
--- a/libjava/gnu/java/net/natPlainSocketImplPosix.cc
+++ b/libjava/gnu/java/net/natPlainSocketImplPosix.cc
@@ -64,6 +64,10 @@ union SockAddr
 void
 gnu::java::net::PlainSocketImpl::create (jboolean stream)
 {
+  // We might already have been create()d in the nio case.
+  if (native_fd != -1)
+    return;
+
   int sock = _Jv_socket (AF_INET, stream ? SOCK_STREAM : SOCK_DGRAM, 0);
 
   if (sock < 0)
diff --git a/libjava/gnu/java/nio/SocketChannelImpl.java b/libjava/gnu/java/nio/SocketChannelImpl.java
index cda86e80723..5925712bef2 100644
--- a/libjava/gnu/java/nio/SocketChannelImpl.java
+++ b/libjava/gnu/java/nio/SocketChannelImpl.java
@@ -1,5 +1,5 @@
 /* SocketChannelImpl.java -- 
-   Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -71,6 +71,7 @@ public final class SocketChannelImpl extends SocketChannel
   {
     super (provider);
     impl = new PlainSocketImpl();
+    impl.create(true);
     socket = new NIOSocket (impl, this);
     configureBlocking(true);
   }