diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 14893f95be272d012fc5fe525be9b5576d8df3c8..08cfa256d09b645bba76267627b5c245fc307c76 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2003-01-03  Dhek Bhun Kho  <bhun@chello.nl>
+
+	* gnu/java/rmi/server/UnicastServerRef.java (unexportObject):
+	Don't throw RemoteException.
+	* java/rmi/server/UnicastRemoteObject.java (unexportObject): Don't
+	throw RemoteException.
+
 2003-01-03  Joerg Brunsmann  <joerg_brunsmann@yahoo.de>
 
 	* gnu/gcj/protocol/http/Connection.java (proxyPort, proxyInUse,
diff --git a/libjava/gnu/java/rmi/server/UnicastServerRef.java b/libjava/gnu/java/rmi/server/UnicastServerRef.java
index 4f64452b1247bd8ee0ce5efb796f0a4e3efeed9f..a3a999f2e9f0f77f7c989e078616602b61b0ddbd 100644
--- a/libjava/gnu/java/rmi/server/UnicastServerRef.java
+++ b/libjava/gnu/java/rmi/server/UnicastServerRef.java
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
+  Copyright (c) 1996, 1997, 1998, 1999, 2002, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -129,7 +129,7 @@ public RemoteStub getStub(){
 }
 
 
-public boolean unexportObject(Remote obj, boolean force) throws RemoteException {
+public boolean unexportObject(Remote obj, boolean force) {
     // Remove all hashes of methods which may be called.
     buildMethodHash(obj.getClass(), false);
     return UnicastServer.unexportObject(this, force);
diff --git a/libjava/java/rmi/server/UnicastRemoteObject.java b/libjava/java/rmi/server/UnicastRemoteObject.java
index aefe9701ecd90cc17011cdc47f85ec882c81dd0c..4e2f06ae64baeaef3735faf7ece88bf84a45213b 100644
--- a/libjava/java/rmi/server/UnicastRemoteObject.java
+++ b/libjava/java/rmi/server/UnicastRemoteObject.java
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
+  Copyright (c) 1996, 1997, 1998, 1999, 2002, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -113,7 +113,7 @@ public static RemoteStub exportObject(Remote obj) throws RemoteException {
   }
 
   public static boolean unexportObject(Remote obj, boolean force) 
-    throws RemoteException, NoSuchObjectException 
+    throws NoSuchObjectException 
   {
     if (obj instanceof RemoteObject)
       {