diff --git a/akka-core/src/main/scala/actor/BootableActorLoaderService.scala b/akka-core/src/main/scala/actor/BootableActorLoaderService.scala
index 60f6ec3781..b027dbcc3a 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, ClassLoader.getSystemClassLoader)
+      new URLClassLoader(toDeploy.toArray, getClass.getClassLoader)
     } else getClass.getClassLoader)
   }
 
@@ -43,4 +43,4 @@ trait BootableActorLoaderService extends Bootable with Logging {
   }
   
   abstract override def onUnload = ActorRegistry.shutdownAll
-}
\ No newline at end of file
+}