diff --git a/Makefile b/Makefile
index c179485..2a2090e 100644
--- a/Makefile
+++ b/Makefile
@@ -17,8 +17,9 @@
 
 CC=gcc
 LD=ld
-CFLAGS  = -Wall -nostdinc -ffreestanding -DKERNEL_SOS
-LDFLAGS = --warn-common -nostdlib
+CFLAGS  = -Wall -nostdinc -ffreestanding -DKERNEL_SOS -m32	\
+	  -fno-asynchronous-unwind-tables
+LDFLAGS = --warn-common -nostdlib -m elf_i386
 OBJECTS = bootstrap/multiboot.o					\
           hwcore/idt.o hwcore/gdt.o				\
 	  hwcore/exception.o hwcore/exception_wrappers.o	\
diff --git a/support/build_image.sh b/support/build_image.sh
index 43929cd..aeafd02 100755
--- a/support/build_image.sh
+++ b/support/build_image.sh
@@ -49,7 +49,7 @@ print_usage () {
   exit 1
 }
 
-grub_dirs_common="/usr/local/share/grub/i386-freebsd /usr/local/share/grub/i386-pc /usr/share/grub/i386-pc /usr/lib/grub/i386-pc /usr/local/grub /usr/share/grub/i386-redhat /usr/local/src/grub-0.5.94 $HOME/share/grub/i386-pc/"
+grub_dirs_common="/usr/local/share/grub/i386-freebsd /usr/local/share/grub/i386-pc /usr/share/grub/i386-pc /usr/lib/grub/i386-pc /usr/local/grub /usr/share/grub/i386-redhat /usr/local/src/grub-0.5.94 $HOME/share/grub/i386-pc/ /usr/lib/grub/x86_64-unknown"
 sbin_grub_path="/usr/local/sbin /usr/sbin /sbin $HOME/sbin"
 
 PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin
@@ -66,7 +66,7 @@ IMG_FNAME=fd.img
 ## Format disk image
 ##
 init_image () {
-  echo "Initialize disk image $IMG_FILE..."
+  echo "Initialize disk image $IMG_FNAME..."
   if [ ! -f $IMG_FNAME ] ; then
     dd if=/dev/zero of=$IMG_FNAME bs=18k count=80 1>/dev/null 2>&1
   fi