diff --git a/src/pocketmine/PocketMine.php b/src/pocketmine/PocketMine.php
index 4de8fe6a3..19573ffb3 100644
--- a/src/pocketmine/PocketMine.php
+++ b/src/pocketmine/PocketMine.php
@@ -98,11 +98,8 @@ namespace pocketmine {
 	$autoloader = new CompatibleClassLoader();
 	$autoloader->addPath(\pocketmine\PATH . "src");
 	$autoloader->addPath(\pocketmine\PATH . "src" . DIRECTORY_SEPARATOR . "spl");
+	$autoloader->addPath(\pocketmine\PATH . "src" . DIRECTORY_SEPARATOR . "raklib");
 	$autoloader->register(true);
-	if(!class_exists("raklib\\RakLib", false)){
-		require(\pocketmine\PATH . "src/raklib/raklib/RakLib.php");
-	}
-	RakLib::bootstrap($autoloader);
 
 	//Startup code. Do not look at it, it can harm you. Most of them are hacks to fix date-related bugs, or basic functions used after this
 
diff --git a/src/raklib b/src/raklib
index 9435637fd..6fad38f76 160000
--- a/src/raklib
+++ b/src/raklib
@@ -1 +1 @@
-Subproject commit 9435637fd7262e16ec2c4e4186c30c8989b7cd56
+Subproject commit 6fad38f761d9ee204839eb557503645799b2ec99