diff --git a/img/makefile b/img/makefile
index f57c02d..0c3cdd3 100644
--- a/img/makefile
+++ b/img/makefile
@@ -358,8 +358,7 @@ xfs_v5_files_s05k_b4k_n8k.img:
 fat32_test0.img:
 	fallocate -l 64MiB $@
 	mkfs.fat -n KOLIBRIOS -F 32 $@
-	sudo mount $@ $(TEMP_DIR)
-	sudo chown $$USER $(TEMP_DIR) -R
+	sudo mount -o codepage=866,iocharset=utf8,umask=111,dmask=000 $@ $(TEMP_DIR)
 	$(RANDDIR) $(TEMP_DIR) 1000 8 255 65536
 	$(DIRTOTEST) $(TEMP_DIR) fat32_test0.img hd0 > ../test/045_#f70_#fat32_test0.t
 	tree $(TEMP_DIR)
diff --git a/makefile b/makefile
index 6cddd89..f306be3 100644
--- a/makefile
+++ b/makefile
@@ -1,4 +1,4 @@
-KOLIBRIOS=/root/Sources/kolibrios
+KOLIBRIOS ?= /root/Sources/kolibrios
 FASM=fasm -dUEFI=1 -dextended_primary_loader=1 -dUMKA=1
 CC=gcc
 WARNINGS=-Wall -Wextra -Wduplicated-cond -Wduplicated-branches -Wlogical-op \