diff --git a/akka-actors/src/main/scala/nio/Cluster.scala b/akka-actors/src/main/scala/nio/Cluster.scala
index be59219400..aa8a90cf59 100644
--- a/akka-actors/src/main/scala/nio/Cluster.scala
+++ b/akka-actors/src/main/scala/nio/Cluster.scala
@@ -33,8 +33,8 @@ object Cluster extends Cluster {
       
       def name = impl.map(_.name).getOrElse("No cluster")
       def members = impl.map(_.members).getOrElse(Nil)
-      def registerLocalNode(server : RemoteAddress)   : Unit = impl.map(_.registerLocalNode(server))
-      def deregisterLocalNode(server : RemoteAddress) : Unit = impl.map(_.deregisterLocalNode(server))
+      def registerLocalNode(hostname : String, port : Int)   : Unit = impl.map(_.registerLocalNode(RemoteAddress(hostname,port)))
+      def deregisterLocalNode(hostname : String, port : Int) : Unit = impl.map(_.deregisterLocalNode(RemoteAddress(hostname,port)))
 }
 
 object JGroupsClusterActor {
diff --git a/akka-actors/src/main/scala/nio/RemoteServer.scala b/akka-actors/src/main/scala/nio/RemoteServer.scala
index 5a542268c8..2f7cfced3f 100755
--- a/akka-actors/src/main/scala/nio/RemoteServer.scala
+++ b/akka-actors/src/main/scala/nio/RemoteServer.scala
@@ -109,11 +109,13 @@ class RemoteServer extends Logging {
       bootstrap.setOption("child.connectTimeoutMillis", RemoteServer.CONNECTION_TIMEOUT_MILLIS)
       bootstrap.bind(new InetSocketAddress(hostname, port))
       isRunning = true
+      Cluster.registerLocalNode(hostname,port)
     }
   }
 
   def shutdown = {
     bootstrap.releaseExternalResources
+    Cluster.deregisterLocalNode(hostname,port)
   }
 }