diff --git a/Makefile b/Makefile
index 156ddd8..a098eb0 100644
--- a/Makefile
+++ b/Makefile
@@ -179,9 +179,14 @@ initrd_gz: clean config.mak devices initrd
 
 usb_img: check_root
 	dd if=/dev/zero of=frugalware-$(FWVER)-$(CARCH)-usb.img bs=1k count=$$(echo "$$(du -c vmlinuz-$(KERNELV)-fw$(KERNELREL)-$(CARCH) initrd-$(CARCH).img.gz|sed -n 's/^\(.*\)\t.*$$/\1/;$$ p')+2000"|bc)
-	/sbin/mke2fs -F frugalware-$(FWVER)-$(CARCH)-usb.img
+	losetup /dev/loop0 frugalware-$(FWVER)-$(CARCH)-usb.img
+	echo -e 'n\np\n1\n\n\nw'|/sbin/fdisk -u -C$$(echo "$$(du -c vmlinuz-$(KERNELV)-fw$(KERNELREL)-$(CARCH) initrd-$(CARCH).img.gz|sed -n 's/^\(.*\)\t.*$$/\1/;$$ p')+2000"|bc) -S63 -H16 /dev/loop0 || true
+	losetup -d /dev/loop0
+	losetup -o32256 /dev/loop0 frugalware-$(FWVER)-$(CARCH)-usb.img
+	/sbin/mke2fs -F /dev/loop0
+	losetup -d /dev/loop0
 	mkdir i
-	mount -o loop -t ext2 frugalware-$(FWVER)-$(CARCH)-usb.img i
+	mount -t ext2 -o loop,offset=32256 frugalware-$(FWVER)-$(CARCH)-usb.img i
 	mkdir -p i/boot/grub
 	cp vmlinuz-$(KERNELV)-fw$(KERNELREL)-$(CARCH) i/boot/
 	cp initrd-$(CARCH).img.gz i/boot/
@@ -198,10 +203,12 @@ usb_img: check_root
 		initrd initrd-$(CARCH).img.gz" > i/boot/grub/menu.lst
 	umount frugalware-$(FWVER)-$(CARCH)-usb.img
 	rmdir i
-	echo -e "device (fd0) frugalware-$(FWVER)-$(CARCH)-usb.img \n\
-		root (fd0) \n\
+	losetup /dev/loop0 frugalware-$(FWVER)-$(CARCH)-usb.img
+	echo -e "device (fd0) /dev/loop0 \n\
+		root (fd0,0) \n\
 		setup (fd0) \n\
 		quit" | grub --batch --device-map=/dev/null
+	losetup -d /dev/loop0
 
 update:
 	git pull