Index: boot/arch/amd64/Makefile.inc
===================================================================
--- boot/arch/amd64/Makefile.inc	(revision 09285268680b736d54a4a59cd29ffeff37e8a272)
+++ boot/arch/amd64/Makefile.inc	(revision 57b4f469e7b99aef70031cf3f2d0a09930de3f2d)
@@ -49,11 +49,7 @@
 	$(USPACEDIR)/app/tester/tester \
 	$(USPACEDIR)/app/klog/klog \
-	$(USPACEDIR)/app/cli/cli
-ifneq ($(RDFMT),tmpfs)
-	RD_TASKS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs
-endif
-ifneq ($(RDFMT),fat)
-	RD_TASKS += $(USPACEDIR)/srv/fs/fat/fat
-endif
+	$(USPACEDIR)/app/cli/cli \
+	$(USPACEDIR)/srv/fs/tmpfs/tmpfs \
+	$(USPACEDIR)/srv/fs/fat/fat
 
 build: $(BASE)/image.iso
@@ -76,9 +72,11 @@
 	done
 ifeq ($(RDFMT),tmpfs)
-	$(BASE)/tools/mktmpfs.py 4096 $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.img
+	$(BASE)/tools/mktmpfs.py $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs.img
 endif
 ifeq ($(RDFMT),fat)
-	$(BASE)/tools/mkfat.sh $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.img
+	$(BASE)/tools/mkfat.sh $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs.img
 endif
+	$(BASE)/tools/mkhord.py 4096 arch/$(ARCH)/iso/boot/initrd.fs.img arch/$(ARCH)/iso/boot/initrd.img
+	rm arch/$(ARCH)/iso/boot/initrd.fs.img
 	mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o $(BASE)/image.iso arch/$(ARCH)/iso/
 
Index: boot/arch/arm32/loader/Makefile
===================================================================
--- boot/arch/arm32/loader/Makefile	(revision 09285268680b736d54a4a59cd29ffeff37e8a272)
+++ boot/arch/arm32/loader/Makefile	(revision 57b4f469e7b99aef70031cf3f2d0a09930de3f2d)
@@ -123,5 +123,7 @@
 		cp $$task $(USPACEDIR)/dist/sbin/ ; \
 	done
-	../../../../tools/mktmpfs.py 4096 $(USPACEDIR)/dist/ initrd.img
+	../../../../tools/mktmpfs.py $(USPACEDIR)/dist/ initrd.fs.img
+	../../../../tools/mkhord.py 4096 initrd.fs.img initrd.img
+	rm initrd.fs.img
 	../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 4096 "unsigned int" $(COMPONENTS) ./initrd.img
 
Index: boot/arch/ia32/Makefile.inc
===================================================================
--- boot/arch/ia32/Makefile.inc	(revision 09285268680b736d54a4a59cd29ffeff37e8a272)
+++ boot/arch/ia32/Makefile.inc	(revision 57b4f469e7b99aef70031cf3f2d0a09930de3f2d)
@@ -60,5 +60,7 @@
 		cp $$task $(USPACEDIR)/dist/sbin/ ; \
 	done
-	$(BASE)/tools/mktmpfs.py 4096 $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.img
+	$(BASE)/tools/mktmpfs.py $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs.img
+	$(BASE)/tools/mkhord.py 4096 arch/$(ARCH)/iso/boot/initrd.fs.img arch/$(ARCH)/iso/boot/initrd.img
+	rm arch/$(ARCH)/iso/boot/initrd.fs.img
 	mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o $(BASE)/image.iso arch/$(ARCH)/iso/
 
Index: boot/arch/mips32/loader/Makefile
===================================================================
--- boot/arch/mips32/loader/Makefile	(revision 09285268680b736d54a4a59cd29ffeff37e8a272)
+++ boot/arch/mips32/loader/Makefile	(revision 57b4f469e7b99aef70031cf3f2d0a09930de3f2d)
@@ -124,5 +124,7 @@
 		cp $$task $(USPACEDIR)/dist/sbin/ ; \
 	done
-	../../../../tools/mktmpfs.py 16384 $(USPACEDIR)/dist/ initrd.img
+	../../../../tools/mktmpfs.py $(USPACEDIR)/dist/ initrd.fs.img
+	../../../../tools/mkhord.py 16384 initrd.fs.img initrd.img
+	rm initrd.fs.img
 	../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 16384 "unsigned int" $(COMPONENTS) ./initrd.img
 
Index: boot/arch/ppc32/loader/Makefile
===================================================================
--- boot/arch/ppc32/loader/Makefile	(revision 09285268680b736d54a4a59cd29ffeff37e8a272)
+++ boot/arch/ppc32/loader/Makefile	(revision 57b4f469e7b99aef70031cf3f2d0a09930de3f2d)
@@ -118,5 +118,7 @@
 		cp $$task $(USPACEDIR)/dist/sbin/ ; \
 	done
-	../../../../tools/mktmpfs.py 4096 $(USPACEDIR)/dist/ initrd.img
+	../../../../tools/mktmpfs.py $(USPACEDIR)/dist/ initrd.fs.img
+	../../../../tools/mkhord.py 4096 initrd.fs.img initrd.img
+	rm initrd.fs.img
 	../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 4096 "unsigned int" $(COMPONENTS) ./initrd.img
 
Index: boot/arch/sparc64/loader/Makefile
===================================================================
--- boot/arch/sparc64/loader/Makefile	(revision 09285268680b736d54a4a59cd29ffeff37e8a272)
+++ boot/arch/sparc64/loader/Makefile	(revision 57b4f469e7b99aef70031cf3f2d0a09930de3f2d)
@@ -121,5 +121,7 @@
 		cp $$task $(USPACEDIR)/dist/sbin/ ; \
 	done
-	../../../../tools/mktmpfs.py 16384 $(USPACEDIR)/dist/ initrd.img
+	../../../../tools/mktmpfs.py $(USPACEDIR)/dist/ initrd.fs.img
+	../../../../tools/mkhord.py 16384 initrd.fs.img initrd.img
+	rm initrd.fs.img
 	../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 1 "unsigned long" $(COMPONENTS) ./initrd.img