diff --git a/world/linux-mainline/Makefile b/world/linux-mainline/Makefile
index dfce4ce..0acf197 100644
--- a/world/linux-mainline/Makefile
+++ b/world/linux-mainline/Makefile
@@ -4,8 +4,8 @@
 distname     = linux
 default_goal = installkernel
 include world.mk
-srcdir       = $(build)/src/linux-$(linux_version)
-objdir       = $(build)/src/linux-$(linux_version)
+srcdir       = $(basedir)/build/src-world/linux-$(linux_version)
+objdir       = $(basedir)/build/obj-world/linux-$(linux_version)
 
 config      ?= $(wkgdir)/config-$(arch)-$(linux_version).config
 
@@ -71,7 +71,7 @@ $(objdir):
 
 $(srcdir)/.dirstamp:
 	$(info $(grn)=== Extracting $(distlocal) ===$(reset))
-	tar -xf $(distlocal) -C $(build)/src
+	tar -xf $(distlocal) -C $(basedir)/build/src-world
 	touch $@
 
 .PHONY: buildkernel installkernel
diff --git a/world/linux-mainline/config-aarch64-5.11.config b/world/linux-mainline/config-aarch64-5.11.5.config
similarity index 100%
rename from world/linux-mainline/config-aarch64-5.11.config
rename to world/linux-mainline/config-aarch64-5.11.5.config
diff --git a/world/linux-mainline/config-armv7l-5.11.config b/world/linux-mainline/config-armv7l-5.11.5.config
similarity index 100%
rename from world/linux-mainline/config-armv7l-5.11.config
rename to world/linux-mainline/config-armv7l-5.11.5.config
diff --git a/world/linux-mainline/config-i486-5.11.config b/world/linux-mainline/config-i486-5.11.5.config
similarity index 100%
rename from world/linux-mainline/config-i486-5.11.config
rename to world/linux-mainline/config-i486-5.11.5.config
diff --git a/world/linux-mainline/config-i686-5.11.config b/world/linux-mainline/config-i686-5.11.5.config
similarity index 100%
rename from world/linux-mainline/config-i686-5.11.config
rename to world/linux-mainline/config-i686-5.11.5.config
diff --git a/world/linux-mainline/config-i786-5.11.config b/world/linux-mainline/config-i786-5.11.5.config
similarity index 100%
rename from world/linux-mainline/config-i786-5.11.config
rename to world/linux-mainline/config-i786-5.11.5.config
diff --git a/world/linux-mainline/config-riscv64-5.11.config b/world/linux-mainline/config-riscv64-5.11.5.config
similarity index 100%
rename from world/linux-mainline/config-riscv64-5.11.config
rename to world/linux-mainline/config-riscv64-5.11.5.config
diff --git a/world/linux-mainline/config-x86_64-5.11.config b/world/linux-mainline/config-x86_64-5.11.5.config
similarity index 100%
rename from world/linux-mainline/config-x86_64-5.11.config
rename to world/linux-mainline/config-x86_64-5.11.5.config