diff --git a/akka-core/src/main/scala/remote/BootableRemoteActorService.scala b/akka-core/src/main/scala/remote/BootableRemoteActorService.scala
index 429fdb61ec..1c31c3025c 100644
--- a/akka-core/src/main/scala/remote/BootableRemoteActorService.scala
+++ b/akka-core/src/main/scala/remote/BootableRemoteActorService.scala
@@ -35,14 +35,21 @@ trait BootableRemoteActorService extends Bootable with Logging {
       super.onLoad
 
   }
-  
+
   abstract override def onUnload = {
-        super.onUnload          
-        if (remoteServerThread.isAlive) {
-        log.info("Shutting down Remote Actors Service")
-        RemoteNode.shutdown
-        remoteServerThread.join(1000)
-    }
+    super.onUnload
+
+    log.info("Shutting down Remote Actors Service")
+
+    RemoteNode.shutdown
+
+    if (remoteServerThread.isAlive)
+      remoteServerThread.join(1000)
+
+    log.info("Shutting down Cluster")
     Cluster.shutdown
+
+    log.info("Remote Actors Service has been shut down")
   }
+
 }
\ No newline at end of file