diff --git a/akka-core/src/main/scala/actor/BootableActorLoaderService.scala b/akka-core/src/main/scala/actor/BootableActorLoaderService.scala
index 8e77eec2be..1bacbf6f59 100644
--- a/akka-core/src/main/scala/actor/BootableActorLoaderService.scala
+++ b/akka-core/src/main/scala/actor/BootableActorLoaderService.scala
@@ -30,7 +30,7 @@ trait BootableActorLoaderService extends Bootable with Logging {
       }
       val toDeploy = for (f <- DEPLOY_DIR.listFiles().toArray.toList.asInstanceOf[List[File]]) yield f.toURL
       log.info("Deploying applications from [%s]: [%s]", DEPLOY, toDeploy.toArray.toList)
-      new URLClassLoader(toDeploy.toArray, getClass.getClassLoader)
+      new URLClassLoader(toDeploy.toArray, ClassLoader.getSystemClassLoader)
     } else if (getClass.getClassLoader.getResourceAsStream("akka.conf") ne null) {
       getClass.getClassLoader
     } else throw new IllegalStateException(
@@ -39,17 +39,12 @@ trait BootableActorLoaderService extends Bootable with Logging {
   }
 
   abstract override def onLoad = {
-    for (loader <- applicationLoader;
-         clazz <- BOOT_CLASSES)
-    {
+    for (loader <- applicationLoader; clazz <- BOOT_CLASSES) {
       log.info("Loading boot class [%s]", clazz)
       loader.loadClass(clazz).newInstance
     }
-
     super.onLoad
   }
   
-  abstract override def onUnload = {
-     ActorRegistry.shutdownAll
-  }
+  abstract override def onUnload = ActorRegistry.shutdownAll
 }
\ No newline at end of file
diff --git a/akka-core/src/main/scala/remote/RemoteServer.scala b/akka-core/src/main/scala/remote/RemoteServer.scala
index 4edcb60168..3d77046df6 100644
--- a/akka-core/src/main/scala/remote/RemoteServer.scala
+++ b/akka-core/src/main/scala/remote/RemoteServer.scala
@@ -33,6 +33,11 @@ import org.jboss.netty.handler.codec.compression.{ZlibEncoder, ZlibDecoder}
  * <pre>
  * RemoteNode.start(hostname, port)
  * </pre>
+ * 
+ * You can specify the class loader to use to load the remote actors.
+ * <pre>
+ * RemoteNode.start(hostname, port, classLoader)
+ * </pre>
  *
  * If you need to create more than one, then you can use the RemoteServer:
  *