diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e0655c05977..623caa0d592 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-18  Michael Koch  <konqueror@gmx.de>
+
+	* java/rmi/activation/ActivationSystem.java
+	(SYSTEM_PORT): Initialize with correct port number.
+
 2004-10-18  Michael Koch  <konqueror@gmx.de>
 
 	* java/lang/reflect/Proxy.java: Improved javadocs.
diff --git a/libjava/java/rmi/activation/ActivationSystem.java b/libjava/java/rmi/activation/ActivationSystem.java
index fd8a9aa78a3..944238941c3 100644
--- a/libjava/java/rmi/activation/ActivationSystem.java
+++ b/libjava/java/rmi/activation/ActivationSystem.java
@@ -42,7 +42,7 @@ import java.rmi.RemoteException;
 
 public interface ActivationSystem extends Remote
 {
-  int SYSTEM_PORT = 0; // XXX
+  int SYSTEM_PORT = 1098;
 
   ActivationID registerObject (ActivationDesc desc)
     throws ActivationException, UnknownGroupException, RemoteException;