diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 8c4953444850..81e60a1303b0 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-19  Michael Koch  <konqueror@gmx.de>
+
+	* gnu/java/nio/natSocketChannelImpl.cc:
+	Added support for platforms without network support.
+
 2003-02-19  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
 
 	* gnu/gcj/runtime/natStackTrace.cc: Include platform.h immediately
diff --git a/libjava/gnu/java/nio/natSocketChannelImpl.cc b/libjava/gnu/java/nio/natSocketChannelImpl.cc
index 167ee92f140c..98fe011d5c76 100644
--- a/libjava/gnu/java/nio/natSocketChannelImpl.cc
+++ b/libjava/gnu/java/nio/natSocketChannelImpl.cc
@@ -1,6 +1,6 @@
-// natSelectorImpl.cc
+// natSocketChannelImpl.cc
 
-/* Copyright (C) 2002  Free Software Foundation
+/* Copyright (C) 2002, 2003  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -19,6 +19,62 @@ details.  */
 #include <java/net/InetAddress.h>
 #include <java/net/SocketException.h>
 
+
+#ifndef DISABLE_JAVA_NET
+
+jint
+gnu::java::nio::SocketChannelImpl::SocketCreate ()
+{
+  throw new ::java::io::IOException (JvNewStringUTF ("SocketCreate not implemented"));
+}
+
+jint
+gnu::java::nio::SocketChannelImpl::SocketConnect (jint,
+                                                  ::java::net::InetAddress *,
+                                                  jint)
+{
+  throw new ::java::io::IOException (JvNewStringUTF ("SocketConnect not implemented"));
+}
+
+jint
+gnu::java::nio::SocketChannelImpl::SocketBind (jint, ::java::net::InetAddress *,
+                                               jint)
+{
+  throw new ::java::io::IOException (JvNewStringUTF ("SocketBind not implemented"));
+}
+
+jint
+gnu::java::nio::SocketChannelImpl::SocketListen (jint, jint)
+{
+  throw new ::java::io::IOException (JvNewStringUTF ("SocketList not implemented"));
+}
+
+jint
+gnu::java::nio::SocketChannelImpl::SocketAvailable (jint)
+{
+  throw new ::java::net::SocketException (JvNewStringLatin1 ("SocketAvailable: not implemented"));
+}
+
+jint
+gnu::java::nio::SocketChannelImpl::SocketClose (jint)
+{
+  throw new ::java::net::SocketException (JvNewStringLatin1 ("SocketClose: not implemented"));
+}
+
+jint
+gnu::java::nio::SocketChannelImpl::SocketRead (jint, jbyteArray, jint, jint)
+{
+  throw new ::java::net::SocketException (JvNewStringLatin1 ("SocketRead: not implemented"));
+}
+
+jint
+gnu::java::nio::SocketChannelImpl::SocketWrite (jint, jbyteArray, jint, jint)
+{
+  throw new ::java::net::SocketException (JvNewStringLatin1 ("SocketWrite: not implemented"));
+}
+
+#else
+
 jint
 gnu::java::nio::SocketChannelImpl::SocketCreate ()
 {
@@ -112,3 +168,5 @@ gnu::java::nio::SocketChannelImpl::SocketWrite (jint fd, jbyteArray data,
 
   return result;
 }
+
+#endif