diff --git a/Kernel/Makefile b/Kernel/Makefile
index 976a81e5d9..0b001661e1 100644
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -80,7 +80,10 @@ $(KERNEL): $(OBJS)
 	@echo "LD $@"; $(LD) $(LDFLAGS) -o $@ -Ttext 0x10000 $(OBJS)
 
 $(IMAGE): $(KERNEL) $(BOOTLOADER)
-	@echo "CREATE $@"; cat $(BOOTLOADER) $(KERNEL) > $(IMAGE)
+	@echo "CREATE $@"; cat $(BOOTLOADER) $(KERNEL) > .tmp-floppy-image
+	@dd if=/dev/zero bs=2M count=1 >> .tmp-floppy-image 2> /dev/null
+	@dd if=.tmp-floppy-image of=.floppy-image bs=1440k count=1 2>/dev/null
+	@rm -f .tmp-floppy-image
 
 $(BOOTLOADER): Boot/boot.asm
 	@echo "NASM $<"; $(NASM) -f bin -o $@ $<
diff --git a/Kernel/run b/Kernel/run
index 688f381619..a856bcf5f6 100755
--- a/Kernel/run
+++ b/Kernel/run
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-if [ "$1" = "q" ]; then
-    qemu-system-i386 -drive format=raw,file=.floppy-image,if=floppy -drive format=raw,file=_fs_contents #$@
-else
+if [ "$1" = "b" ]; then
     bochs -q -f .bochsrc
+else
+    qemu-system-i386 -m 32 -drive format=raw,file=.floppy-image,if=floppy -drive format=raw,file=_fs_contents #$@
 fi